Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / extensions / bundle_installed_bubble.cc

diff --git a/src/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc b/src/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc
index e2ce524..cc81815 100644 (file)
--- a/src/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc
+++ b/src/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc
@@ -8,12 +8,10 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
-#include "grit/ui_resources.h"
+#include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/resources/grit/ui_resources.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
@@ -62,7 +60,7 @@ class BundleInstalledBubble : public views::BubbleDelegateView,
     AddContent(layout, bundle);
   }
 
-  virtual ~BundleInstalledBubble() {}
+  ~BundleInstalledBubble() override {}
 
  private:
   void AddContent(GridLayout* layout, const BundleInstaller* bundle) {
@@ -98,8 +96,7 @@ class BundleInstalledBubble : public views::BubbleDelegateView,
           BundleInstaller::Item::STATE_FAILED));
     }
 
-    views::BubbleDelegateView::CreateBubble(this);
-    StartFade(true);
+    views::BubbleDelegateView::CreateBubble(this)->Show();
   }
 
   void AddItemList(GridLayout* layout, const BundleInstaller::ItemList& items) {
@@ -143,9 +140,8 @@ class BundleInstalledBubble : public views::BubbleDelegateView,
   }
 
   // views::ButtonListener implementation:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE {
-    StartFade(false);
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
+    GetWidget()->Close();
   }
 
   DISALLOW_COPY_AND_ASSIGN(BundleInstalledBubble);