| Index: ash/mus/layout_manager.h
|
| diff --git a/ash/mus/layout_manager.h b/ash/mus/layout_manager.h
|
| index 67be8c243d3ba7eb427a325239d3dfdd03585b1f..daf99fe10364e681b727d04ccb2b049e722c9c5b 100644
|
| --- a/ash/mus/layout_manager.h
|
| +++ b/ash/mus/layout_manager.h
|
| @@ -19,39 +19,39 @@ namespace mus {
|
| // LayoutManagers observe both the bound container and all its children.
|
| // They must be attached prior to any windows being added to the
|
| // container.
|
| -class LayoutManager : public ::ui::WindowObserver {
|
| +class LayoutManager : public ui::WindowObserver {
|
| public:
|
| ~LayoutManager() override;
|
|
|
| protected:
|
| - explicit LayoutManager(::ui::Window* owner);
|
| + explicit LayoutManager(ui::Window* owner);
|
|
|
| void Uninstall();
|
|
|
| // Overridden from ui::WindowObserver:
|
| void OnTreeChanged(
|
| - const ::ui::WindowObserver::TreeChangeParams& params) override;
|
| - void OnWindowDestroying(::ui::Window* window) override;
|
| - void OnWindowBoundsChanged(::ui::Window* window,
|
| + const ui::WindowObserver::TreeChangeParams& params) override;
|
| + void OnWindowDestroying(ui::Window* window) override;
|
| + void OnWindowBoundsChanged(ui::Window* window,
|
| const gfx::Rect& old_bounds,
|
| const gfx::Rect& new_bounds) 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;
|
|
|
| - virtual void WindowAdded(::ui::Window* window);
|
| - virtual void WindowRemoved(::ui::Window* window);
|
| - virtual void LayoutWindow(::ui::Window* window) = 0;
|
| + virtual void WindowAdded(ui::Window* window);
|
| + virtual void WindowRemoved(ui::Window* window);
|
| + virtual void LayoutWindow(ui::Window* window) = 0;
|
|
|
| // Add a property that triggers layout when changed.
|
| void AddLayoutProperty(const std::string& property);
|
|
|
| - ::ui::Window* owner() { return owner_; }
|
| + ui::Window* owner() { return owner_; }
|
|
|
| private:
|
| - ::ui::Window* owner_;
|
| + ui::Window* owner_;
|
|
|
| std::set<std::string> layout_properties_;
|
|
|
|
|