summaryrefslogtreecommitdiffstats
path: root/ash/launcher
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-02 01:20:40 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-02 01:20:40 +0000
commit6c7a6d221aefd8bf35e5e4368e91b532b5fd12c3 (patch)
treefaf91af315c91a59c2497eda6640ce3ddeb801ed /ash/launcher
parent026fa4e27bdc4bfefae6b54113edc1a816836250 (diff)
downloadchromium_src-6c7a6d221aefd8bf35e5e4368e91b532b5fd12c3.zip
chromium_src-6c7a6d221aefd8bf35e5e4368e91b532b5fd12c3.tar.gz
chromium_src-6c7a6d221aefd8bf35e5e4368e91b532b5fd12c3.tar.bz2
views: Extract Widget observer into its own header file.
R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10834079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
-rw-r--r--ash/launcher/overflow_bubble.cc1
-rw-r--r--ash/launcher/overflow_bubble.h6
2 files changed, 4 insertions, 3 deletions
diff --git a/ash/launcher/overflow_bubble.cc b/ash/launcher/overflow_bubble.cc
index ec7437f..55cf345 100644
--- a/ash/launcher/overflow_bubble.cc
+++ b/ash/launcher/overflow_bubble.cc
@@ -12,6 +12,7 @@
#include "ui/gfx/screen.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/bubble/bubble_frame_view.h"
+#include "ui/views/widget/widget.h"
namespace ash {
namespace internal {
diff --git a/ash/launcher/overflow_bubble.h b/ash/launcher/overflow_bubble.h
index aa2d0e3..88c4d76 100644
--- a/ash/launcher/overflow_bubble.h
+++ b/ash/launcher/overflow_bubble.h
@@ -8,7 +8,7 @@
#include "ash/wm/shelf_types.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_observer.h"
namespace views {
class View;
@@ -24,7 +24,7 @@ namespace internal {
class LauncherView;
// OverflowBubble displays an overflow bubble.
-class OverflowBubble : public views::Widget::Observer {
+class OverflowBubble : public views::WidgetObserver {
public:
OverflowBubble();
virtual ~OverflowBubble();
@@ -40,7 +40,7 @@ class OverflowBubble : public views::Widget::Observer {
bool IsShowing() const { return !!bubble_; }
private:
- // views::Widget::Observer overrides:
+ // Overridden from views::WidgetObserver:
virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
views::View* bubble_; // Owned by views hierarchy.