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

Unified Diff: ash/wm/window_resizer.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_properties.cc ('k') | ash/wm/window_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_resizer.cc
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc
index 14c1fd9ea1f6120aab9b87be3140c20652274e6e..08ff0c42fec07d859f6c2229c055d7ec262ae785 100644
--- a/ash/wm/window_resizer.cc
+++ b/ash/wm/window_resizer.cc
@@ -142,10 +142,9 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
gfx::Rect work_area =
Shell::GetScreen()->GetDisplayNearestWindow(GetTarget()).work_area();
aura::Window* dock_container = Shell::GetContainer(
- GetTarget()->GetRootWindow(),
- internal::kShellWindowId_DockedContainer);
- internal::DockedWindowLayoutManager* dock_layout =
- static_cast<internal::DockedWindowLayoutManager*>(
+ GetTarget()->GetRootWindow(), kShellWindowId_DockedContainer);
+ DockedWindowLayoutManager* dock_layout =
+ static_cast<DockedWindowLayoutManager*>(
dock_container->layout_manager());
work_area.Union(dock_layout->docked_bounds());
@@ -211,11 +210,11 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
// calculate the target display after the drag.
const gfx::Display& display =
Shell::GetScreen()->GetDisplayMatching(near_passed_location);
- aura::Window* dock_container = Shell::GetContainer(
- wm::GetRootWindowMatching(near_passed_location),
- internal::kShellWindowId_DockedContainer);
- internal::DockedWindowLayoutManager* dock_layout =
- static_cast<internal::DockedWindowLayoutManager*>(
+ aura::Window* dock_container =
+ Shell::GetContainer(wm::GetRootWindowMatching(near_passed_location),
+ kShellWindowId_DockedContainer);
+ DockedWindowLayoutManager* dock_layout =
+ static_cast<DockedWindowLayoutManager*>(
dock_container->layout_manager());
gfx::Rect screen_work_area = display.work_area();
« no previous file with comments | « ash/wm/window_properties.cc ('k') | ash/wm/window_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698