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

Unified Diff: ash/display/screen_position_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/display/screen_position_controller.h ('k') | ash/display/screen_position_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_position_controller.cc
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index 6572ac12210dc3cf17fe2d11cbdc223289a15fbd..6ab4b5489e3adee83f537369326e88a26ea45d6b 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -28,9 +28,8 @@ namespace {
// Return true if the window or its ancestor has |kStayInSameRootWindowkey|
// property.
bool ShouldStayInSameRootWindow(const aura::Window* window) {
- return window &&
- (window->GetProperty(internal::kStayInSameRootWindowKey) ||
- ShouldStayInSameRootWindow(window->parent()));
+ return window && (window->GetProperty(kStayInSameRootWindowKey) ||
+ ShouldStayInSameRootWindow(window->parent()));
}
// Move all transient children to |dst_root|, including the ones in
@@ -115,8 +114,6 @@ std::pair<aura::Window*, gfx::Point> GetRootWindowRelativeToWindow(
} // namespace
-namespace internal {
-
void ScreenPositionController::ConvertPointToScreen(
const aura::Window* window,
gfx::Point* point) {
@@ -152,7 +149,7 @@ void ScreenPositionController::SetBounds(aura::Window* window,
const gfx::Rect& bounds,
const gfx::Display& display) {
DCHECK_NE(-1, display.id());
- if (!window->parent()->GetProperty(internal::kUsesScreenCoordinatesKey)) {
+ if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) {
window->SetBounds(bounds);
return;
}
@@ -228,5 +225,4 @@ void ScreenPositionController::SetBounds(aura::Window* window,
window->SetBounds(gfx::Rect(origin, bounds.size()));
}
-} // internal
-} // ash
+} // namespace ash
« no previous file with comments | « ash/display/screen_position_controller.h ('k') | ash/display/screen_position_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698