Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1622)

Unified Diff: ash/mus/shelf_layout_manager.h

Issue 2182633011: Replaces ::ui:: with ui:: in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/shadow_controller.cc ('k') | ash/mus/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/shelf_layout_manager.h
diff --git a/ash/mus/shelf_layout_manager.h b/ash/mus/shelf_layout_manager.h
index 8cca50a077acf81c2e5a58d2f816f5174bdd1060..3f96571064ead55606557327c8c8483dba5633ef 100644
--- a/ash/mus/shelf_layout_manager.h
+++ b/ash/mus/shelf_layout_manager.h
@@ -17,11 +17,11 @@ class ShelfLayoutManagerDelegate;
// Lays out the shelf within shelf containers.
class ShelfLayoutManager : public LayoutManager {
public:
- ShelfLayoutManager(::ui::Window* owner, ShelfLayoutManagerDelegate* delegate);
+ ShelfLayoutManager(ui::Window* owner, ShelfLayoutManagerDelegate* delegate);
~ShelfLayoutManager() override;
// Returns the shelf, which may be null.
- ::ui::Window* GetShelfWindow();
+ ui::Window* GetShelfWindow();
void SetAlignment(mash::shelf::mojom::Alignment alignment);
void SetAutoHideBehavior(mash::shelf::mojom::AutoHideBehavior auto_hide);
@@ -33,8 +33,8 @@ class ShelfLayoutManager : public LayoutManager {
private:
// Overridden from LayoutManager:
- void LayoutWindow(::ui::Window* window) override;
- void WindowAdded(::ui::Window* window) override;
+ void LayoutWindow(ui::Window* window) override;
+ void WindowAdded(ui::Window* window) override;
ShelfLayoutManagerDelegate* delegate_;
mash::shelf::mojom::Alignment alignment_;
« no previous file with comments | « ash/mus/shadow_controller.cc ('k') | ash/mus/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698