Index: extensions/shell/browser/shell_browser_main_parts.h |
diff --git a/apps/shell/browser/shell_browser_main_parts.h b/extensions/shell/browser/shell_browser_main_parts.h |
similarity index 79% |
rename from apps/shell/browser/shell_browser_main_parts.h |
rename to extensions/shell/browser/shell_browser_main_parts.h |
index e9b8bf3823804932452d2550234b0e65395af8f7..8d316955db7006f1ca8ca943b9da1e346f219d7e 100644 |
--- a/apps/shell/browser/shell_browser_main_parts.h |
+++ b/extensions/shell/browser/shell_browser_main_parts.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
-#define APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
+#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
+#define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
@@ -17,12 +17,6 @@ class ShellDevToolsDelegate; |
struct MainFunctionParams; |
} |
-namespace extensions { |
-class ShellExtensionsBrowserClient; |
-class ShellExtensionSystem; |
-class ShellOmahaQueryParamsDelegate; |
-} |
- |
namespace views { |
class Widget; |
} |
@@ -31,12 +25,15 @@ namespace net { |
class NetLog; |
} |
-namespace apps { |
+namespace extensions { |
class ShellBrowserContext; |
class ShellBrowserMainDelegate; |
class ShellDesktopController; |
+class ShellExtensionsBrowserClient; |
class ShellExtensionsClient; |
+class ShellExtensionSystem; |
+class ShellOmahaQueryParamsDelegate; |
#if defined(OS_CHROMEOS) |
class ShellNetworkController; |
@@ -49,13 +46,9 @@ class ShellBrowserMainParts : public content::BrowserMainParts { |
ShellBrowserMainDelegate* browser_main_delegate); |
virtual ~ShellBrowserMainParts(); |
- ShellBrowserContext* browser_context() { |
- return browser_context_.get(); |
- } |
+ ShellBrowserContext* browser_context() { return browser_context_.get(); } |
- extensions::ShellExtensionSystem* extension_system() { |
- return extension_system_; |
- } |
+ ShellExtensionSystem* extension_system() { return extension_system_; } |
// BrowserMainParts overrides. |
virtual void PreEarlyInitialization() OVERRIDE; |
@@ -77,15 +70,13 @@ class ShellBrowserMainParts : public content::BrowserMainParts { |
scoped_ptr<ShellDesktopController> desktop_controller_; |
scoped_ptr<ShellBrowserContext> browser_context_; |
scoped_ptr<ShellExtensionsClient> extensions_client_; |
- scoped_ptr<extensions::ShellExtensionsBrowserClient> |
- extensions_browser_client_; |
+ scoped_ptr<ShellExtensionsBrowserClient> extensions_browser_client_; |
scoped_ptr<net::NetLog> net_log_; |
scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_; |
- scoped_ptr<extensions::ShellOmahaQueryParamsDelegate> |
- omaha_query_params_delegate_; |
+ scoped_ptr<ShellOmahaQueryParamsDelegate> omaha_query_params_delegate_; |
// Owned by the KeyedService system. |
- extensions::ShellExtensionSystem* extension_system_; |
+ ShellExtensionSystem* extension_system_; |
// For running app browsertests. |
const content::MainFunctionParams parameters_; |
@@ -99,6 +90,6 @@ class ShellBrowserMainParts : public content::BrowserMainParts { |
DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); |
}; |
-} // namespace apps |
+} // namespace extensions |
-#endif // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |
+#endif // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ |