Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: chrome/browser/extensions/extension_system_impl.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: polish 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_system_impl.h" 5 #include "chrome/browser/extensions/extension_system_impl.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/strings/string_tokenizer.h" 12 #include "base/strings/string_tokenizer.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/content_settings/cookie_settings.h" 14 #include "chrome/browser/content_settings/cookie_settings.h"
15 #include "chrome/browser/extensions/blacklist.h" 15 #include "chrome/browser/extensions/blacklist.h"
16 #include "chrome/browser/extensions/chrome_component_extension_resource_manager. h"
16 #include "chrome/browser/extensions/component_loader.h" 17 #include "chrome/browser/extensions/component_loader.h"
17 #include "chrome/browser/extensions/error_console/error_console.h" 18 #include "chrome/browser/extensions/error_console/error_console.h"
18 #include "chrome/browser/extensions/extension_error_reporter.h" 19 #include "chrome/browser/extensions/extension_error_reporter.h"
19 #include "chrome/browser/extensions/extension_service.h" 20 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/extensions/extension_system_factory.h" 21 #include "chrome/browser/extensions/extension_system_factory.h"
21 #include "chrome/browser/extensions/extension_util.h" 22 #include "chrome/browser/extensions/extension_util.h"
22 #include "chrome/browser/extensions/extension_warning_badge_service.h" 23 #include "chrome/browser/extensions/extension_warning_badge_service.h"
23 #include "chrome/browser/extensions/extension_warning_set.h" 24 #include "chrome/browser/extensions/extension_warning_set.h"
24 #include "chrome/browser/extensions/install_verifier.h" 25 #include "chrome/browser/extensions/install_verifier.h"
25 #include "chrome/browser/extensions/navigation_observer.h" 26 #include "chrome/browser/extensions/navigation_observer.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 base::StringTokenizerT<CommandLine::StringType, 313 base::StringTokenizerT<CommandLine::StringType,
313 CommandLine::StringType::const_iterator> t(path_list, 314 CommandLine::StringType::const_iterator> t(path_list,
314 FILE_PATH_LITERAL(",")); 315 FILE_PATH_LITERAL(","));
315 while (t.GetNext()) { 316 while (t.GetNext()) {
316 std::string extension_id; 317 std::string extension_id;
317 UnpackedInstaller::Create(extension_service_.get())-> 318 UnpackedInstaller::Create(extension_service_.get())->
318 LoadFromCommandLine(base::FilePath(t.token()), &extension_id); 319 LoadFromCommandLine(base::FilePath(t.token()), &extension_id);
319 } 320 }
320 } 321 }
321 } 322 }
323
324 ComponentExtensionResourceManager::Set(
James Cook 2014/06/17 22:01:04 I would prefer to do this through ExtensionsBrowse
Jun Mukai 2014/06/17 23:53:02 Done.
325 new ChromeComponentExtensionResourceManager());
322 } 326 }
323 327
324 void ExtensionSystemImpl::Shared::Shutdown() { 328 void ExtensionSystemImpl::Shared::Shutdown() {
329 ComponentExtensionResourceManager::Set(NULL);
325 if (extension_warning_service_) { 330 if (extension_warning_service_) {
326 extension_warning_service_->RemoveObserver( 331 extension_warning_service_->RemoveObserver(
327 extension_warning_badge_service_.get()); 332 extension_warning_badge_service_.get());
328 } 333 }
329 if (content_verifier_) 334 if (content_verifier_)
330 content_verifier_->Shutdown(); 335 content_verifier_->Shutdown();
331 if (extension_service_) 336 if (extension_service_)
332 extension_service_->Shutdown(); 337 extension_service_->Shutdown();
333 } 338 }
334 339
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts( 538 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
534 const std::string& extension_id, 539 const std::string& extension_id,
535 const UnloadedExtensionInfo::Reason reason) { 540 const UnloadedExtensionInfo::Reason reason) {
536 BrowserThread::PostTask( 541 BrowserThread::PostTask(
537 BrowserThread::IO, 542 BrowserThread::IO,
538 FROM_HERE, 543 FROM_HERE,
539 base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason)); 544 base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason));
540 } 545 }
541 546
542 } // namespace extensions 547 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698