| 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 229c8681cef62b1cb2ca29ccf8fdeb69f99bea08..0e07cbf24bc6850985f5f60a6916009b9bcee68d 100644
|
| --- a/ash/shell/content_client/shell_browser_main_parts.h
|
| +++ b/ash/shell/content_client/shell_browser_main_parts.h
|
| @@ -22,11 +22,9 @@ namespace net {
|
| class NetLog;
|
| }
|
|
|
| -namespace views {
|
| -namespace corewm {
|
| +namespace wm {
|
| class WMState;
|
| }
|
| -}
|
|
|
| namespace ash {
|
| namespace shell {
|
| @@ -57,7 +55,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_;
|
| + scoped_ptr<wm::WMState> wm_state_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
|
| };
|
|
|