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

Unified Diff: ash/shell/content_client/shell_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 | « no previous file | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/content_client/shell_browser_main_parts.h
diff --git a/ash/shell/content_client/shell_browser_main_parts.h b/ash/shell/content_client/shell_browser_main_parts.h
index 768ee5e6c3c9503161f77d9fbde7168dd31d3886..229c8681cef62b1cb2ca29ccf8fdeb69f99bea08 100644
--- a/ash/shell/content_client/shell_browser_main_parts.h
+++ b/ash/shell/content_client/shell_browser_main_parts.h
@@ -22,6 +22,12 @@ namespace net {
class NetLog;
}
+namespace views {
+namespace corewm {
+class WMState;
+}
+}
+
namespace ash {
namespace shell {
@@ -37,6 +43,7 @@ class ShellBrowserMainParts : public content::BrowserMainParts {
// Overridden from content::BrowserMainParts:
virtual void PreMainMessageLoopStart() OVERRIDE;
virtual void PostMainMessageLoopStart() OVERRIDE;
+ virtual void ToolkitInitialized() OVERRIDE;
virtual void PreMainMessageLoopRun() OVERRIDE;
virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
virtual void PostMainMessageLoopRun() OVERRIDE;
@@ -50,6 +57,7 @@ class ShellBrowserMainParts : public content::BrowserMainParts {
scoped_ptr<content::ShellBrowserContext> browser_context_;
scoped_ptr<ash::shell::WindowWatcher> window_watcher_;
ShellDelegateImpl* delegate_; // owned by Shell
+ scoped_ptr<views::corewm::WMState> wm_state_;
DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
};
« no previous file with comments | « no previous file | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698