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

Unified Diff: content/shell/browser/shell.h

Issue 2453953003: Moves TransientWindowClient to ui/aura/client and adds observer (Closed)
Patch Set: merge Created 4 years, 2 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 | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell.h
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
index d32886d1083c17c22321e50ea26a73fb1c4115f5..6f36810032181c1cb1adf595961a10c8e5826579 100644
--- a/content/shell/browser/shell.h
+++ b/content/shell/browser/shell.h
@@ -36,6 +36,9 @@ namespace views {
class Widget;
class ViewsDelegate;
}
+namespace wm {
+class WMState;
+}
#endif // defined(USE_AURA)
class GURL;
@@ -253,6 +256,8 @@ class Shell : public WebContentsDelegate,
#if defined(OS_CHROMEOS)
static wm::WMTestHelper* wm_test_helper_;
static display::Screen* test_screen_;
+#else
+ static wm::WMState* wm_state_;
#endif
#if defined(TOOLKIT_VIEWS)
static views::ViewsDelegate* views_delegate_;
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698