| 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);
|
| };
|
|
|