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

Unified Diff: ash/wm/workspace_controller.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/workspace_controller.h ('k') | ash/wm/workspace_controller_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 96735be90f4fc969330028d21662cc2b8b01e73d..5d3ae6e3db89ccb46373920f669e2cd34cddefa7 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -24,7 +24,6 @@
#include "ui/wm/public/activation_client.h"
namespace ash {
-namespace internal {
namespace {
// Amount of time to pause before animating anything. Only used during initial
@@ -70,10 +69,8 @@ WorkspaceWindowState WorkspaceController::GetWindowState() const {
// These are the container ids of containers which may contain windows that
// may overlap the launcher shelf and affect its transparency.
- const int kWindowContainerIds[] = {
- internal::kShellWindowId_DefaultContainer,
- internal::kShellWindowId_DockedContainer,
- };
+ const int kWindowContainerIds[] = {kShellWindowId_DefaultContainer,
+ kShellWindowId_DockedContainer, };
const gfx::Rect shelf_bounds(shelf_->GetIdealBounds());
bool window_overlaps_launcher = false;
for (size_t idx = 0; idx < arraysize(kWindowContainerIds); idx++) {
@@ -141,5 +138,4 @@ void WorkspaceController::SetMaximizeBackdropDelegate(
layout_manager_->SetMaximizeBackdropDelegate(delegate.Pass());
}
-} // namespace internal
} // namespace ash
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | ash/wm/workspace_controller_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698