| Index: ash/mus/shadow_controller.h
|
| diff --git a/ash/mus/shadow_controller.h b/ash/mus/shadow_controller.h
|
| index fa6f49015a39357e86ff4e35ecdba74a7bbab461..a598ac64aa2f2b5f89136599b3aed2695c188f4d 100644
|
| --- a/ash/mus/shadow_controller.h
|
| +++ b/ash/mus/shadow_controller.h
|
| @@ -16,24 +16,24 @@ class WindowTreeClient;
|
| namespace ash {
|
| namespace mus {
|
|
|
| -class ShadowController : public ::ui::WindowTreeClientObserver,
|
| - public ::ui::WindowObserver {
|
| +class ShadowController : public ui::WindowTreeClientObserver,
|
| + public ui::WindowObserver {
|
| public:
|
| - explicit ShadowController(::ui::WindowTreeClient* window_tree);
|
| + explicit ShadowController(ui::WindowTreeClient* window_tree);
|
| ~ShadowController() override;
|
|
|
| private:
|
| - void SetActiveWindow(::ui::Window* window);
|
| + void SetActiveWindow(ui::Window* window);
|
|
|
| // ui::WindowTreeClientObserver:
|
| - void OnWindowTreeFocusChanged(::ui::Window* gained_focus,
|
| - ::ui::Window* lost_focus) override;
|
| + void OnWindowTreeFocusChanged(ui::Window* gained_focus,
|
| + ui::Window* lost_focus) override;
|
|
|
| // ui::WindowObserver:
|
| - void OnWindowDestroying(::ui::Window* window) override;
|
| + void OnWindowDestroying(ui::Window* window) override;
|
|
|
| - ::ui::WindowTreeClient* window_tree_;
|
| - ::ui::Window* active_window_;
|
| + ui::WindowTreeClient* window_tree_;
|
| + ui::Window* active_window_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShadowController);
|
| };
|
|
|