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

Unified Diff: ash/root_window_controller.h

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/metrics/user_metrics_recorder.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index abb8b1f51b878829bb6d2246c797880f537819bb..e9f6b8e5237db1845b124ff848925cce9bcaefdf 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -47,12 +47,6 @@ class ScopedCaptureClient;
}
namespace ash {
-class ShelfWidget;
-class StackingController;
-class SystemTray;
-
-namespace internal {
-
class AlwaysOnTopController;
class AnimatingDesktopController;
class DesktopBackgroundWidgetController;
@@ -61,9 +55,12 @@ class PanelLayoutManager;
class RootWindowLayoutManager;
class ScreenDimmer;
class ShelfLayoutManager;
+class ShelfWidget;
+class StackingController;
class StatusAreaWidget;
class SystemBackgroundController;
class SystemModalContainerLayoutManager;
+class SystemTray;
class TouchHudDebug;
class TouchHudProjection;
class WorkspaceController;
@@ -102,7 +99,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
static RootWindowController* ForWindow(const aura::Window* window);
// Returns the RootWindowController of the target root window.
- static internal::RootWindowController* ForTargetRootWindow();
+ static RootWindowController* ForTargetRootWindow();
// Returns container which contains a given |window|.
static aura::Window* GetContainerForWindow(aura::Window* window);
@@ -320,7 +317,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
ASH_EXPORT RootWindowController* GetRootWindowController(
const aura::Window* root_window);
-} // namespace internal
} // ash
#endif // ASH_ROOT_WINDOW_CONTROLLER_H_
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698