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

Unified Diff: ash/touch/touch_observer_hud.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/touch/touch_observer_hud.h ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud.cc
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
index 923c34c8ff3bb1d7ec800735f2eca322990c6ecf..81908ab8765790243b42e08e78182f9dd55b098f 100644
--- a/ash/touch/touch_observer_hud.cc
+++ b/ash/touch/touch_observer_hud.cc
@@ -16,7 +16,6 @@
#include "ui/views/widget/widget.h"
namespace ash {
-namespace internal {
TouchObserverHUD::TouchObserverHUD(aura::Window* initial_root)
: display_id_(GetRootWindowSettings(initial_root)->display_id),
@@ -37,9 +36,8 @@ TouchObserverHUD::TouchObserverHUD(aura::Window* initial_root)
params.can_activate = false;
params.accept_events = false;
params.bounds = display.bounds();
- params.parent = Shell::GetContainer(
- root_window_,
- internal::kShellWindowId_OverlayContainer);
+ params.parent =
+ Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer);
widget_->Init(params);
widget_->SetContentsView(content);
widget_->StackAtTop();
@@ -127,7 +125,7 @@ void TouchObserverHUD::OnDisplayConfigurationChanging() {
views::Widget::ReparentNativeView(
widget_->GetNativeView(),
Shell::GetContainer(root_window_,
- internal::kShellWindowId_UnparentedControlContainer));
+ kShellWindowId_UnparentedControlContainer));
root_window_ = NULL;
}
@@ -141,8 +139,7 @@ void TouchObserverHUD::OnDisplayConfigurationChanged() {
views::Widget::ReparentNativeView(
widget_->GetNativeView(),
- Shell::GetContainer(root_window_,
- internal::kShellWindowId_OverlayContainer));
+ Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer));
RootWindowController* controller = GetRootWindowController(root_window_);
SetHudForRootWindowController(controller);
@@ -150,5 +147,4 @@ void TouchObserverHUD::OnDisplayConfigurationChanged() {
root_window_->AddPreTargetHandler(this);
}
-} // namespace internal
} // namespace ash
« no previous file with comments | « ash/touch/touch_observer_hud.h ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698