Chromium Code Reviews| Index: wm/shell/content_client/shell_browser_main_parts.h |
| diff --git a/ash/shell/content_client/shell_browser_main_parts.h b/wm/shell/content_client/shell_browser_main_parts.h |
| similarity index 79% |
| copy from ash/shell/content_client/shell_browser_main_parts.h |
| copy to wm/shell/content_client/shell_browser_main_parts.h |
| index 8c513064e9fc9c66c2c189d5a9f5a158a2e16b5e..feeec8fb6cd533d9a24532af21b25380354629fd 100644 |
| --- a/ash/shell/content_client/shell_browser_main_parts.h |
| +++ b/wm/shell/content_client/shell_browser_main_parts.h |
| @@ -2,17 +2,13 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
| -#define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
| +#ifndef WM_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
| +#define WM_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
| #include "base/basictypes.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "content/public/browser/browser_main_parts.h" |
| -namespace base { |
| -class Thread; |
| -} |
| - |
| namespace content { |
| class ShellBrowserContext; |
| struct MainFunctionParams; |
| @@ -20,9 +16,14 @@ struct MainFunctionParams; |
| namespace ash { |
| namespace shell { |
| - |
| -class ShellDelegateImpl; |
| class WindowWatcher; |
| +} |
| +} |
| + |
| +namespace wm { |
| +class ForeignTestWindow; |
| + |
| +namespace shell { |
| class ShellBrowserMainParts : public content::BrowserMainParts { |
| public: |
| @@ -44,12 +45,12 @@ class ShellBrowserMainParts : public content::BrowserMainParts { |
| private: |
| scoped_ptr<content::ShellBrowserContext> browser_context_; |
| scoped_ptr<ash::shell::WindowWatcher> window_watcher_; |
| - ShellDelegateImpl* delegate_; // owned by Shell |
| + scoped_ptr<wm::ForeignTestWindow> foreign_test_window_; |
|
danakj
2013/02/21 01:33:15
Is this class only used for tests? Should it have
reveman
2013/02/22 01:26:44
Not sure what you're referring to. ShellBrowserMai
danakj
2013/02/22 01:48:08
Oh.. right I forgot about test shell.
|
| DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); |
| }; |
| } // namespace shell |
| -} // namespace ash |
| +} // namespace wm |
| -#endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |
| +#endif // WM_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ |