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

Unified Diff: ui/views/examples/content_client/examples_browser_main_parts.h

Issue 105813013: Adds views::corewm::WMState to install common state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix viewseventtestbase Created 7 years 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 | « ui/views/corewm/wm_state.cc ('k') | ui/views/examples/content_client/examples_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/content_client/examples_browser_main_parts.h
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.h b/ui/views/examples/content_client/examples_browser_main_parts.h
index c3e3172c6d51abdd185979b5cbb76a3d001d2354..362fec8b93dc50d6c1ddedbcfe5d2e1ae2c2110c 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.h
+++ b/ui/views/examples/content_client/examples_browser_main_parts.h
@@ -21,6 +21,10 @@ class WMTestHelper;
namespace views {
class ViewsDelegate;
+namespace corewm {
+class WMState;
+}
+
namespace examples {
class ExamplesBrowserMainParts : public content::BrowserMainParts {
@@ -30,6 +34,7 @@ class ExamplesBrowserMainParts : public content::BrowserMainParts {
virtual ~ExamplesBrowserMainParts();
// Overridden from content::BrowserMainParts:
+ virtual void ToolkitInitialized() OVERRIDE;
virtual void PreMainMessageLoopRun() OVERRIDE;
virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
virtual void PostMainMessageLoopRun() OVERRIDE;
@@ -48,6 +53,10 @@ class ExamplesBrowserMainParts : public content::BrowserMainParts {
scoped_ptr<wm::WMTestHelper> wm_test_helper_;
#endif
+#if defined(USE_AURA)
+ scoped_ptr<views::corewm::WMState> wm_state_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);
};
« no previous file with comments | « ui/views/corewm/wm_state.cc ('k') | ui/views/examples/content_client/examples_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698