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

Unified Diff: ash/shell.h

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 7 years, 11 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/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 014029b36c00cfb34946f61b92261199df71ce32..a9cdcd2abd1f0c9d4063946217bf34f5c390370a 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -33,7 +33,6 @@ class Window;
namespace client {
class ActivationClient;
class FocusClient;
-class StackingClient;
class UserActionClient;
}
}
@@ -432,8 +431,6 @@ class ASH_EXPORT Shell
}
#endif // defined(OS_CHROMEOS)
- aura::client::StackingClient* stacking_client();
-
RootWindowHostFactory* root_window_host_factory() {
return root_window_host_factory_.get();
}
@@ -514,7 +511,6 @@ class ASH_EXPORT Shell
scoped_ptr<internal::AppListController> app_list_controller_;
- scoped_ptr<aura::client::StackingClient> stacking_client_;
scoped_ptr<internal::ActivationController> activation_controller_;
scoped_ptr<internal::CaptureController> capture_controller_;
scoped_ptr<internal::DragDropController> drag_drop_controller_;
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698