chrome/browser/extensions/chrome_extensions_browser_client.cc - Issue 334053003: Moves extension_icon_image and image_loader to extensions/browser

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 334053003: Moves extension_icon_image and image_loader to extensions/browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revive component_extension_resource_manager Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/chrome_extensions_browser_client.h ('k') | chrome/browser/extensions/extension_action_icon_factory.h » ('j') | extensions/browser/component_extension_resource_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/chrome_extensions_browser_client.cc

diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc

index fe53a0750dd61c75133aa8d25a66999ac6ead6b1..0edb09b5e7134a0c2dfa941d90ecc10fd09e216f 100644

--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc

+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc

@@ -6,6 +6,7 @@

#include "apps/common/api/generated_api.h"

#include "base/command_line.h"

+#include "base/path_service.h"

#include "base/version.h"

#include "chrome/browser/app_mode/app_mode_utils.h"

#include "chrome/browser/browser_process.h"

@@ -15,6 +16,7 @@

#include "chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h"

#include "chrome/browser/extensions/api/web_request/web_request_api.h"

#include "chrome/browser/extensions/chrome_app_sorting.h"

+#include "chrome/browser/extensions/chrome_component_extension_resource_manager.h"

#include "chrome/browser/extensions/chrome_extension_host_delegate.h"

#include "chrome/browser/extensions/extension_system_factory.h"

#include "chrome/browser/extensions/extension_util.h"

@@ -23,6 +25,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/browser_finder.h"

+#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/extensions/api/generated_api.h"

@@ -270,6 +273,13 @@ void ChromeExtensionsBrowserClient::RegisterExtensionFunctions(

#endif

}

+ComponentExtensionResourceManager*

+ChromeExtensionsBrowserClient::GetComponentExtensionResourceManager() {

+ if (!resource_manager_)

+ resource_manager_.reset(new ChromeComponentExtensionResourceManager());

+ return resource_manager_.get();

scoped_ptr<extensions::RuntimeAPIDelegate>

ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate(

content::BrowserContext* context) const {