| Index: ash/mus/frame/non_client_frame_view_mash.h
|
| diff --git a/ash/mus/frame/non_client_frame_view_mash.h b/ash/mus/frame/non_client_frame_view_mash.h
|
| index 1b2a32d07e1872a4a2dd0404b358efa23299d79e..70f4e4edad1d2ec0fa67a39e45a560544fbd66e8 100644
|
| --- a/ash/mus/frame/non_client_frame_view_mash.h
|
| +++ b/ash/mus/frame/non_client_frame_view_mash.h
|
| @@ -30,13 +30,13 @@ namespace mus {
|
| class FrameCaptionButtonContainerView;
|
|
|
| class NonClientFrameViewMash : public views::NonClientFrameView,
|
| - public ::ui::WindowObserver,
|
| - public ::ui::WindowTreeClientObserver {
|
| + public ui::WindowObserver,
|
| + public ui::WindowTreeClientObserver {
|
| public:
|
| // Internal class name.
|
| static const char kViewClassName[];
|
|
|
| - NonClientFrameViewMash(views::Widget* frame, ::ui::Window* window);
|
| + NonClientFrameViewMash(views::Widget* frame, ui::Window* window);
|
| ~NonClientFrameViewMash() override;
|
|
|
| static gfx::Insets GetPreferredClientAreaInsets();
|
| @@ -68,12 +68,12 @@ class NonClientFrameViewMash : public views::NonClientFrameView,
|
|
|
| // ui::WindowObserver:
|
| void OnWindowClientAreaChanged(
|
| - ::ui::Window* window,
|
| + ui::Window* window,
|
| const gfx::Insets& old_client_area,
|
| const std::vector<gfx::Rect>& old_additional_client_area) override;
|
| - void OnWindowDestroyed(::ui::Window* window) override;
|
| + void OnWindowDestroyed(ui::Window* window) override;
|
| void OnWindowSharedPropertyChanged(
|
| - ::ui::Window* window,
|
| + ui::Window* window,
|
| const std::string& name,
|
| const std::vector<uint8_t>* old_data,
|
| const std::vector<uint8_t>* new_data) override;
|
| @@ -90,13 +90,13 @@ class NonClientFrameViewMash : public views::NonClientFrameView,
|
| void RemoveObservers();
|
|
|
| // ui::WindowTreeClientObserver:
|
| - void OnWindowTreeFocusChanged(::ui::Window* gained_focus,
|
| - ::ui::Window* lost_focus) override;
|
| + void OnWindowTreeFocusChanged(ui::Window* gained_focus,
|
| + ui::Window* lost_focus) override;
|
|
|
| // Not owned.
|
| views::Widget* frame_;
|
|
|
| - ::ui::Window* window_;
|
| + ui::Window* window_;
|
| ui::PaintCache paint_cache_;
|
|
|
| // View which contains the title and window controls.
|
|
|