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

Unified Diff: ash/wm/window_state.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/wm/window_state.h ('k') | ash/wm/workspace/magnetism_matcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_state.cc
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc
index 9af59cabff19aaf5bd865f3d2f06704b0067f50c..7714acaa916c18a60e9e15c09f94612069ae8449 100644
--- a/ash/wm/window_state.cc
+++ b/ash/wm/window_state.cc
@@ -150,7 +150,7 @@ bool WindowState::IsActive() const {
bool WindowState::IsDocked() const {
return window_->parent() &&
- window_->parent()->id() == internal::kShellWindowId_DockedContainer;
+ window_->parent()->id() == kShellWindowId_DockedContainer;
}
bool WindowState::CanMaximize() const {
@@ -158,12 +158,11 @@ bool WindowState::CanMaximize() const {
}
bool WindowState::CanMinimize() const {
- internal::RootWindowController* controller =
- internal::RootWindowController::ForWindow(window_);
+ RootWindowController* controller = RootWindowController::ForWindow(window_);
if (!controller)
return false;
- aura::Window* lockscreen = controller->GetContainer(
- internal::kShellWindowId_LockScreenContainersContainer);
+ aura::Window* lockscreen =
+ controller->GetContainer(kShellWindowId_LockScreenContainersContainer);
if (lockscreen->Contains(window_))
return false;
@@ -418,10 +417,10 @@ WindowState* GetActiveWindowState() {
WindowState* GetWindowState(aura::Window* window) {
if (!window)
return NULL;
- WindowState* settings = window->GetProperty(internal::kWindowStateKey);
+ WindowState* settings = window->GetProperty(kWindowStateKey);
if(!settings) {
settings = new WindowState(window);
- window->SetProperty(internal::kWindowStateKey, settings);
+ window->SetProperty(kWindowStateKey, settings);
}
return settings;
}
« no previous file with comments | « ash/wm/window_state.h ('k') | ash/wm/workspace/magnetism_matcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698