views: Extract Widget observer into its own header file.

ui/views/bubble/bubble_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_observer.h"
 
 // The duration of the fade animation in milliseconds.
 static const int kHideFadeDurationMS = 200;
 
 // The defaut margin between the content and the inside border, in pixels.
 static const int kDefaultMargin = 6;
 
 namespace views {
 
 namespace {
@@ skipping 16 matching lines @@
 #endif
   bubble_widget->Init(bubble_params);
   return bubble_widget;
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 // Windows uses two widgets and some extra complexity to host partially
 // transparent native controls and use per-pixel HWND alpha on the border.
 // TODO(msw): Clean these up when Windows native controls are no longer needed.
 class BubbleBorderDelegate : public WidgetDelegate,
-                             public Widget::Observer {
+                             public WidgetObserver {
  public:
   BubbleBorderDelegate(BubbleDelegateView* bubble, Widget* widget)
       : bubble_(bubble),
         widget_(widget) {
     bubble_->GetWidget()->AddObserver(this);
   }
 
   virtual ~BubbleBorderDelegate() {
     if (bubble_ && bubble_->GetWidget())
       bubble_->GetWidget()->RemoveObserver(this);
   }
 
   // WidgetDelegate overrides:
   virtual bool CanActivate() const OVERRIDE { return false; }
   virtual void DeleteDelegate() OVERRIDE { delete this; }
   virtual Widget* GetWidget() OVERRIDE { return widget_; }
   virtual const Widget* GetWidget() const OVERRIDE { return widget_; }
   virtual NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE {
+      Widget* widget) OVERRIDE {
     return bubble_->CreateNonClientFrameView(widget);
   }
 
-  // Widget::Observer overrides:
+  // WidgetObserver overrides:
   virtual void OnWidgetClosing(Widget* widget) OVERRIDE {
     bubble_ = NULL;
     widget_->Close();
   }
 
  private:
   BubbleDelegateView* bubble_;
   Widget* widget_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleBorderDelegate);
@@ skipping 27 matching lines @@
       anchor_view_(NULL),
       anchor_widget_(NULL),
       move_with_anchor_(false),
       arrow_location_(BubbleBorder::TOP_LEFT),
       color_(kBackgroundColor),
       margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
       original_opacity_(255),
       border_widget_(NULL),
       use_focusless_(false),
       parent_window_(NULL) {
-  set_background(views::Background::CreateSolidBackground(color_));
+  set_background(Background::CreateSolidBackground(color_));
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
 BubbleDelegateView::BubbleDelegateView(
     View* anchor_view,
     BubbleBorder::ArrowLocation arrow_location)
     : close_on_esc_(true),
       close_on_deactivate_(true),
       anchor_view_(anchor_view),
       anchor_widget_(NULL),
       move_with_anchor_(false),
       arrow_location_(arrow_location),
       color_(kBackgroundColor),
       margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
       original_opacity_(255),
       border_widget_(NULL),
       use_focusless_(false),
       parent_window_(NULL) {
-  set_background(views::Background::CreateSolidBackground(color_));
+  set_background(Background::CreateSolidBackground(color_));
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
 BubbleDelegateView::~BubbleDelegateView() {
   if (anchor_widget() != NULL)
     anchor_widget()->RemoveObserver(this);
   anchor_widget_ = NULL;
   anchor_view_ = NULL;
 }
 
@@ skipping 179 matching lines @@
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowBoundsInScreen().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views