| Index: extensions/shell/browser/shell_extensions_browser_client.cc
|
| diff --git a/apps/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc
|
| similarity index 87%
|
| rename from apps/shell/browser/shell_extensions_browser_client.cc
|
| rename to extensions/shell/browser/shell_extensions_browser_client.cc
|
| index 54b0df84fcac9969c66d47e8d1be7324ce8b2c3c..82a3050296a1aae01cc258b30b81d76cb8ced5d5 100644
|
| --- a/apps/shell/browser/shell_extensions_browser_client.cc
|
| +++ b/extensions/shell/browser/shell_extensions_browser_client.cc
|
| @@ -2,13 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "apps/shell/browser/shell_extensions_browser_client.h"
|
| +#include "extensions/shell/browser/shell_extensions_browser_client.h"
|
|
|
| -#include "apps/shell/browser/shell_app_sorting.h"
|
| -#include "apps/shell/browser/shell_extension_system_factory.h"
|
| -#include "apps/shell/browser/shell_extension_web_contents_observer.h"
|
| -#include "apps/shell/browser/shell_runtime_api_delegate.h"
|
| -#include "apps/shell/common/api/generated_api.h"
|
| #include "base/prefs/pref_service.h"
|
| #include "base/prefs/pref_service_factory.h"
|
| #include "base/prefs/testing_pref_store.h"
|
| @@ -20,6 +15,11 @@
|
| #include "extensions/browser/extension_host_delegate.h"
|
| #include "extensions/browser/extension_prefs.h"
|
| #include "extensions/common/api/generated_api.h"
|
| +#include "extensions/shell/browser/shell_app_sorting.h"
|
| +#include "extensions/shell/browser/shell_extension_system_factory.h"
|
| +#include "extensions/shell/browser/shell_extension_web_contents_observer.h"
|
| +#include "extensions/shell/browser/shell_runtime_api_delegate.h"
|
| +#include "extensions/shell/common/api/generated_api.h"
|
|
|
| using content::BrowserContext;
|
|
|
| @@ -38,11 +38,11 @@ class ShellExtensionHostDelegate : public ExtensionHostDelegate {
|
| virtual ~ShellExtensionHostDelegate() {}
|
|
|
| // ExtensionHostDelegate implementation.
|
| - virtual void OnExtensionHostCreated(content::WebContents* web_contents)
|
| - OVERRIDE;
|
| + virtual void OnExtensionHostCreated(
|
| + content::WebContents* web_contents) OVERRIDE;
|
|
|
| - virtual void OnRenderViewCreatedForBackgroundPage(ExtensionHost* host)
|
| - OVERRIDE {}
|
| + virtual void OnRenderViewCreatedForBackgroundPage(
|
| + ExtensionHost* host) OVERRIDE {}
|
|
|
| virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager()
|
| OVERRIDE {
|
| @@ -96,7 +96,8 @@ ShellExtensionsBrowserClient::ShellExtensionsBrowserClient(
|
| user_prefs::UserPrefs::Set(browser_context_, prefs_.get());
|
| }
|
|
|
| -ShellExtensionsBrowserClient::~ShellExtensionsBrowserClient() {}
|
| +ShellExtensionsBrowserClient::~ShellExtensionsBrowserClient() {
|
| +}
|
|
|
| bool ShellExtensionsBrowserClient::IsShuttingDown() {
|
| return false;
|
| @@ -145,7 +146,7 @@ bool ShellExtensionsBrowserClient::IsExtensionIncognitoEnabled(
|
| }
|
|
|
| bool ShellExtensionsBrowserClient::CanExtensionCrossIncognito(
|
| - const extensions::Extension* extension,
|
| + const Extension* extension,
|
| content::BrowserContext* context) const {
|
| return false;
|
| }
|
| @@ -181,7 +182,8 @@ PrefService* ShellExtensionsBrowserClient::GetPrefServiceForContext(
|
|
|
| void ShellExtensionsBrowserClient::GetEarlyExtensionPrefsObservers(
|
| content::BrowserContext* context,
|
| - std::vector<ExtensionPrefsObserver*>* observers) const {}
|
| + std::vector<ExtensionPrefsObserver*>* observers) const {
|
| +}
|
|
|
| ProcessManagerDelegate*
|
| ShellExtensionsBrowserClient::GetProcessManagerDelegate() const {
|
| @@ -199,7 +201,7 @@ bool ShellExtensionsBrowserClient::DidVersionUpdate(BrowserContext* context) {
|
| }
|
|
|
| scoped_ptr<AppSorting> ShellExtensionsBrowserClient::CreateAppSorting() {
|
| - return scoped_ptr<AppSorting>(new apps::ShellAppSorting);
|
| + return scoped_ptr<AppSorting>(new ShellAppSorting);
|
| }
|
|
|
| bool ShellExtensionsBrowserClient::IsRunningInForcedAppMode() {
|
| @@ -220,16 +222,16 @@ ShellExtensionsBrowserClient::GetExtensionSystemFactory() {
|
| void ShellExtensionsBrowserClient::RegisterExtensionFunctions(
|
| ExtensionFunctionRegistry* registry) const {
|
| // Register core extension-system APIs.
|
| - extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry);
|
| + core_api::GeneratedFunctionRegistry::RegisterAll(registry);
|
|
|
| // Register chrome.shell APIs.
|
| - apps::shell_api::GeneratedFunctionRegistry::RegisterAll(registry);
|
| + shell_api::GeneratedFunctionRegistry::RegisterAll(registry);
|
| }
|
|
|
| scoped_ptr<RuntimeAPIDelegate>
|
| ShellExtensionsBrowserClient::CreateRuntimeAPIDelegate(
|
| content::BrowserContext* context) const {
|
| - return scoped_ptr<RuntimeAPIDelegate>(new apps::ShellRuntimeAPIDelegate());
|
| + return scoped_ptr<RuntimeAPIDelegate>(new ShellRuntimeAPIDelegate());
|
| }
|
|
|
| ComponentExtensionResourceManager*
|
|
|