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

Unified Diff: ash/screen_util.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/scoped_target_root_window.cc ('k') | ash/screensaver/screensaver_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screen_util.cc
diff --git a/ash/screen_util.cc b/ash/screen_util.cc
index 9d7404c1bb2f8f9745331f5c2c8fa2b08d3eb626..a412d70f04d3c17b2b05e61aeb8a2d38ce2e8854 100644
--- a/ash/screen_util.cc
+++ b/ash/screen_util.cc
@@ -20,7 +20,7 @@
namespace ash {
namespace {
-internal::DisplayManager* GetDisplayManager() {
+DisplayManager* GetDisplayManager() {
return Shell::GetInstance()->display_manager();
}
}
@@ -32,7 +32,7 @@ gfx::Display ScreenUtil::FindDisplayContainingPoint(const gfx::Point& point) {
// static
gfx::Rect ScreenUtil::GetMaximizedWindowBoundsInParent(aura::Window* window) {
- if (internal::GetRootWindowController(window->GetRootWindow())->shelf())
+ if (GetRootWindowController(window->GetRootWindow())->shelf())
return GetDisplayWorkAreaBoundsInParent(window);
else
return GetDisplayBoundsInParent(window);
@@ -72,7 +72,7 @@ gfx::Rect ScreenUtil::ConvertRectFromScreen(aura::Window* window,
// static
const gfx::Display& ScreenUtil::GetSecondaryDisplay() {
- internal::DisplayManager* display_manager = GetDisplayManager();
+ DisplayManager* display_manager = GetDisplayManager();
CHECK_EQ(2U, display_manager->GetNumDisplays());
return display_manager->GetDisplayAt(0).id() ==
Shell::GetScreen()->GetPrimaryDisplay().id() ?
« no previous file with comments | « ash/scoped_target_root_window.cc ('k') | ash/screensaver/screensaver_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698