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

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 9667015: Remove ExtensionMessageService's legacy support for devtools. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 if (command_line->HasSwitch( 437 if (command_line->HasSwitch(
438 switches::kEnableExtensionTimelineApi)) { 438 switches::kEnableExtensionTimelineApi)) {
439 extension_devtools_manager_ = new ExtensionDevToolsManager(this); 439 extension_devtools_manager_ = new ExtensionDevToolsManager(this);
440 } 440 }
441 441
442 // The ExtensionInfoMap needs to be created before the 442 // The ExtensionInfoMap needs to be created before the
443 // ExtensionProcessManager. 443 // ExtensionProcessManager.
444 extension_info_map_ = new ExtensionInfoMap(); 444 extension_info_map_ = new ExtensionInfoMap();
445 extension_process_manager_.reset(ExtensionProcessManager::Create(this)); 445 extension_process_manager_.reset(ExtensionProcessManager::Create(this));
446 extension_event_router_.reset(new ExtensionEventRouter(this)); 446 extension_event_router_.reset(new ExtensionEventRouter(this));
447 extension_message_service_ = new ExtensionMessageService(this); 447 extension_message_service_.reset(new ExtensionMessageService(this));
Yoyo Zhou 2012/03/10 01:36:54 Yeah, these changes can basically be applied verba
Yoyo Zhou 2012/03/12 18:33:51 It looks like my change is actually going to be bl
448 extension_navigation_observer_.reset(new ExtensionNavigationObserver(this)); 448 extension_navigation_observer_.reset(new ExtensionNavigationObserver(this));
449 449
450 ExtensionErrorReporter::Init(true); // allow noisy errors. 450 ExtensionErrorReporter::Init(true); // allow noisy errors.
451 451
452 user_script_master_ = new UserScriptMaster(this); 452 user_script_master_ = new UserScriptMaster(this);
453 453
454 bool autoupdate_enabled = true; 454 bool autoupdate_enabled = true;
455 #if defined(OS_CHROMEOS) 455 #if defined(OS_CHROMEOS)
456 if (!extensions_enabled) 456 if (!extensions_enabled)
457 autoupdate_enabled = false; 457 autoupdate_enabled = false;
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 // HistoryService will join with HistoryService's backend thread so that 619 // HistoryService will join with HistoryService's backend thread so that
620 // by the time the destructor has finished we're sure it will no longer call 620 // by the time the destructor has finished we're sure it will no longer call
621 // into the BookmarkModel. 621 // into the BookmarkModel.
622 history_service_ = NULL; 622 history_service_ = NULL;
623 bookmark_bar_model_.reset(); 623 bookmark_bar_model_.reset();
624 624
625 // FaviconService depends on HistoryServce so make sure we delete 625 // FaviconService depends on HistoryServce so make sure we delete
626 // HistoryService first. 626 // HistoryService first.
627 favicon_service_.reset(); 627 favicon_service_.reset();
628 628
629 if (extension_message_service_)
630 extension_message_service_->DestroyingProfile();
631
632 if (pref_proxy_config_tracker_.get()) 629 if (pref_proxy_config_tracker_.get())
633 pref_proxy_config_tracker_->DetachFromPrefService(); 630 pref_proxy_config_tracker_->DetachFromPrefService();
634 631
635 if (protocol_handler_registry_) 632 if (protocol_handler_registry_)
636 protocol_handler_registry_->Finalize(); 633 protocol_handler_registry_->Finalize();
637 634
638 if (host_content_settings_map_) 635 if (host_content_settings_map_)
639 host_content_settings_map_->ShutdownOnUIThread(); 636 host_content_settings_map_->ShutdownOnUIThread();
640 637
641 // This causes the Preferences file to be written to disk. 638 // This causes the Preferences file to be written to disk.
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 FilePath* cache_path, 1452 FilePath* cache_path,
1456 int* max_size) { 1453 int* max_size) {
1457 DCHECK(cache_path); 1454 DCHECK(cache_path);
1458 DCHECK(max_size); 1455 DCHECK(max_size);
1459 FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir)); 1456 FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
1460 if (!path.empty()) 1457 if (!path.empty())
1461 *cache_path = path; 1458 *cache_path = path;
1462 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1459 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1463 prefs_->GetInteger(prefs::kDiskCacheSize); 1460 prefs_->GetInteger(prefs::kDiskCacheSize);
1464 } 1461 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698