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

Unified Diff: ash/wm/session_state_animator.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/session_state_animator.h ('k') | ash/wm/stacking_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/session_state_animator.cc
diff --git a/ash/wm/session_state_animator.cc b/ash/wm/session_state_animator.cc
index 586539c555c87c337e281a0b353e0b1700dd57f6..9900275af8a0bf2032bf10661ecf48fdc58c6add 100644
--- a/ash/wm/session_state_animator.cc
+++ b/ash/wm/session_state_animator.cc
@@ -15,8 +15,6 @@
#include "ui/views/widget/widget.h"
namespace ash {
-namespace internal {
-
namespace {
// Slightly-smaller size that we scale the screen down to for the pre-lock and
@@ -460,44 +458,38 @@ void SessionStateAnimator::GetContainers(int container_mask,
if (container_mask & DESKTOP_BACKGROUND) {
containers->push_back(Shell::GetContainer(
- root_window,
- internal::kShellWindowId_DesktopBackgroundContainer));
+ root_window, kShellWindowId_DesktopBackgroundContainer));
}
if (container_mask & LAUNCHER) {
- containers->push_back(Shell::GetContainer(
- root_window,
- internal::kShellWindowId_ShelfContainer));
+ containers->push_back(
+ Shell::GetContainer(root_window, kShellWindowId_ShelfContainer));
}
if (container_mask & NON_LOCK_SCREEN_CONTAINERS) {
// TODO(antrim): Figure out a way to eliminate a need to exclude launcher
// in such way.
aura::Window* non_lock_screen_containers = Shell::GetContainer(
- root_window,
- internal::kShellWindowId_NonLockScreenContainersContainer);
+ root_window, kShellWindowId_NonLockScreenContainersContainer);
aura::Window::Windows children = non_lock_screen_containers->children();
for (aura::Window::Windows::const_iterator it = children.begin();
it != children.end(); ++it) {
aura::Window* window = *it;
- if (window->id() == internal::kShellWindowId_ShelfContainer)
+ if (window->id() == kShellWindowId_ShelfContainer)
continue;
containers->push_back(window);
}
}
if (container_mask & LOCK_SCREEN_BACKGROUND) {
containers->push_back(Shell::GetContainer(
- root_window,
- internal::kShellWindowId_LockScreenBackgroundContainer));
+ root_window, kShellWindowId_LockScreenBackgroundContainer));
}
if (container_mask & LOCK_SCREEN_CONTAINERS) {
containers->push_back(Shell::GetContainer(
- root_window,
- internal::kShellWindowId_LockScreenContainersContainer));
+ root_window, kShellWindowId_LockScreenContainersContainer));
}
if (container_mask & LOCK_SCREEN_RELATED_CONTAINERS) {
containers->push_back(Shell::GetContainer(
- root_window,
- internal::kShellWindowId_LockScreenRelatedContainersContainer));
+ root_window, kShellWindowId_LockScreenRelatedContainersContainer));
}
}
@@ -613,5 +605,4 @@ void SessionStateAnimator::RunAnimationForWindow(
}
}
-} // namespace internal
} // namespace ash
« no previous file with comments | « ash/wm/session_state_animator.h ('k') | ash/wm/stacking_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698