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

Unified Diff: ash/mus/non_client_frame_controller.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/layout_manager_unittest.cc ('k') | ash/mus/non_client_frame_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/non_client_frame_controller.h
diff --git a/ash/mus/non_client_frame_controller.h b/ash/mus/non_client_frame_controller.h
index 113d91f3b04991fb4c69e750a998876d3f436d79..df3f6fa238a797b1267fc96007c63e15a8fb8c12 100644
--- a/ash/mus/non_client_frame_controller.h
+++ b/ash/mus/non_client_frame_controller.h
@@ -30,13 +30,13 @@ namespace mus {
// Provides the non-client frame for mus Windows.
class NonClientFrameController : public views::WidgetDelegateView,
- public ::ui::WindowObserver {
+ public ui::WindowObserver {
public:
// NonClientFrameController deletes itself when |window| is destroyed.
static void Create(shell::Connector* connector,
- ::ui::Window* parent,
- ::ui::Window* window,
- ::ui::WindowManagerClient* window_manager_client);
+ ui::Window* parent,
+ ui::Window* window,
+ ui::WindowManagerClient* window_manager_client);
// Returns the preferred client area insets.
static gfx::Insets GetPreferredClientAreaInsets();
@@ -45,13 +45,13 @@ class NonClientFrameController : public views::WidgetDelegateView,
// title bar.
static int GetMaxTitleBarButtonWidth();
- ::ui::Window* window() { return window_; }
+ ui::Window* window() { return window_; }
private:
NonClientFrameController(shell::Connector* connector,
- ::ui::Window* parent,
- ::ui::Window* window,
- ::ui::WindowManagerClient* window_manager_client);
+ ui::Window* parent,
+ ui::Window* window,
+ ui::WindowManagerClient* window_manager_client);
~NonClientFrameController() override;
// views::WidgetDelegateView:
@@ -65,20 +65,20 @@ class NonClientFrameController : public views::WidgetDelegateView,
// ui::WindowObserver:
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;
- void OnWindowLocalPropertyChanged(::ui::Window* window,
+ void OnWindowLocalPropertyChanged(ui::Window* window,
const void* key,
intptr_t old) override;
- void OnWindowDestroyed(::ui::Window* window) override;
+ void OnWindowDestroyed(ui::Window* window) override;
views::Widget* widget_;
// WARNING: as widget delays destruction there is a portion of time when this
// is null.
- ::ui::Window* window_;
+ ui::Window* window_;
DISALLOW_COPY_AND_ASSIGN(NonClientFrameController);
};
« no previous file with comments | « ash/mus/layout_manager_unittest.cc ('k') | ash/mus/non_client_frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698