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

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

Issue 5730004: Rename ExtensionsService to ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/dom_ui/ntp_resource_cache.h" 30 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
31 #include "chrome/browser/download/download_manager.h" 31 #include "chrome/browser/download/download_manager.h"
32 #include "chrome/browser/extensions/default_apps.h" 32 #include "chrome/browser/extensions/default_apps.h"
33 #include "chrome/browser/extensions/extension_devtools_manager.h" 33 #include "chrome/browser/extensions/extension_devtools_manager.h"
34 #include "chrome/browser/extensions/extension_error_reporter.h" 34 #include "chrome/browser/extensions/extension_error_reporter.h"
35 #include "chrome/browser/extensions/extension_info_map.h" 35 #include "chrome/browser/extensions/extension_info_map.h"
36 #include "chrome/browser/extensions/extension_event_router.h" 36 #include "chrome/browser/extensions/extension_event_router.h"
37 #include "chrome/browser/extensions/extension_message_service.h" 37 #include "chrome/browser/extensions/extension_message_service.h"
38 #include "chrome/browser/extensions/extension_pref_store.h" 38 #include "chrome/browser/extensions/extension_pref_store.h"
39 #include "chrome/browser/extensions/extension_process_manager.h" 39 #include "chrome/browser/extensions/extension_process_manager.h"
40 #include "chrome/browser/extensions/extensions_service.h" 40 #include "chrome/browser/extensions/extension_service.h"
41 #include "chrome/browser/extensions/user_script_master.h" 41 #include "chrome/browser/extensions/user_script_master.h"
42 #include "chrome/browser/favicon_service.h" 42 #include "chrome/browser/favicon_service.h"
43 #include "chrome/browser/file_system/browser_file_system_helper.h" 43 #include "chrome/browser/file_system/browser_file_system_helper.h"
44 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 44 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
45 #include "chrome/browser/geolocation/geolocation_permission_context.h" 45 #include "chrome/browser/geolocation/geolocation_permission_context.h"
46 #include "chrome/browser/history/history.h" 46 #include "chrome/browser/history/history.h"
47 #include "chrome/browser/history/top_sites.h" 47 #include "chrome/browser/history/top_sites.h"
48 #include "chrome/browser/host_zoom_map.h" 48 #include "chrome/browser/host_zoom_map.h"
49 #include "chrome/browser/instant/instant_controller.h" 49 #include "chrome/browser/instant/instant_controller.h"
50 #include "chrome/browser/in_process_webkit/webkit_context.h" 50 #include "chrome/browser/in_process_webkit/webkit_context.h"
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 extension_event_router_.reset(new ExtensionEventRouter(this)); 345 extension_event_router_.reset(new ExtensionEventRouter(this));
346 extension_message_service_ = new ExtensionMessageService(this); 346 extension_message_service_ = new ExtensionMessageService(this);
347 347
348 ExtensionErrorReporter::Init(true); // allow noisy errors. 348 ExtensionErrorReporter::Init(true); // allow noisy errors.
349 349
350 FilePath script_dir; // Don't look for user scripts in any directory. 350 FilePath script_dir; // Don't look for user scripts in any directory.
351 // TODO(aa): We should just remove this functionality, 351 // TODO(aa): We should just remove this functionality,
352 // since it isn't used anymore. 352 // since it isn't used anymore.
353 user_script_master_ = new UserScriptMaster(script_dir, this); 353 user_script_master_ = new UserScriptMaster(script_dir, this);
354 354
355 extensions_service_ = new ExtensionsService( 355 extensions_service_ = new ExtensionService(
356 this, 356 this,
357 CommandLine::ForCurrentProcess(), 357 CommandLine::ForCurrentProcess(),
358 GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName), 358 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
359 extension_prefs_.get(), 359 extension_prefs_.get(),
360 true); 360 true);
361 361
362 RegisterComponentExtensions(); 362 RegisterComponentExtensions();
363 extensions_service_->Init(); 363 extensions_service_->Init();
364 InstallDefaultApps(); 364 InstallDefaultApps();
365 365
366 // Load any extensions specified with --load-extension. 366 // Load any extensions specified with --load-extension.
367 if (command_line->HasSwitch(switches::kLoadExtension)) { 367 if (command_line->HasSwitch(switches::kLoadExtension)) {
368 FilePath path = command_line->GetSwitchValuePath(switches::kLoadExtension); 368 FilePath path = command_line->GetSwitchValuePath(switches::kLoadExtension);
(...skipping 25 matching lines...) Expand all
394 if (PathService::Get(chrome::DIR_RESOURCES, &path)) { 394 if (PathService::Get(chrome::DIR_RESOURCES, &path)) {
395 path = path.AppendASCII(iter->first); 395 path = path.AppendASCII(iter->first);
396 } else { 396 } else {
397 NOTREACHED(); 397 NOTREACHED();
398 } 398 }
399 399
400 std::string manifest = 400 std::string manifest =
401 ResourceBundle::GetSharedInstance().GetRawDataResource( 401 ResourceBundle::GetSharedInstance().GetRawDataResource(
402 iter->second).as_string(); 402 iter->second).as_string();
403 extensions_service_->register_component_extension( 403 extensions_service_->register_component_extension(
404 ExtensionsService::ComponentExtensionInfo(manifest, path)); 404 ExtensionService::ComponentExtensionInfo(manifest, path));
405 } 405 }
406 } 406 }
407 407
408 void ProfileImpl::InstallDefaultApps() { 408 void ProfileImpl::InstallDefaultApps() {
409 #if !defined(OS_CHROMEOS) 409 #if !defined(OS_CHROMEOS)
410 // On desktop Chrome, we don't have default apps on by, err, default yet. 410 // On desktop Chrome, we don't have default apps on by, err, default yet.
411 if (!CommandLine::ForCurrentProcess()->HasSwitch( 411 if (!CommandLine::ForCurrentProcess()->HasSwitch(
412 switches::kEnableDefaultApps)) { 412 switches::kEnableDefaultApps)) {
413 return; 413 return;
414 } 414 }
415 #endif 415 #endif
416 416
417 // The web store only supports en-US at the moment, so we don't install 417 // The web store only supports en-US at the moment, so we don't install
418 // default apps in other locales. 418 // default apps in other locales.
419 if (g_browser_process->GetApplicationLocale() != "en-US") 419 if (g_browser_process->GetApplicationLocale() != "en-US")
420 return; 420 return;
421 421
422 ExtensionsService* extensions_service = GetExtensionsService(); 422 ExtensionService* extensions_service = GetExtensionService();
423 const ExtensionIdSet* app_ids = 423 const ExtensionIdSet* app_ids =
424 extensions_service->default_apps()->GetAppsToInstall(); 424 extensions_service->default_apps()->GetAppsToInstall();
425 if (!app_ids) 425 if (!app_ids)
426 return; 426 return;
427 427
428 for (ExtensionIdSet::const_iterator iter = app_ids->begin(); 428 for (ExtensionIdSet::const_iterator iter = app_ids->begin();
429 iter != app_ids->end(); ++iter) { 429 iter != app_ids->end(); ++iter) {
430 extensions_service->AddPendingExtensionFromDefaultAppList(*iter); 430 extensions_service->AddPendingExtensionFromDefaultAppList(*iter);
431 } 431 }
432 } 432 }
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 scoped_ptr<VisitedLinkMaster> visited_links( 602 scoped_ptr<VisitedLinkMaster> visited_links(
603 new VisitedLinkMaster(visited_link_event_listener_.get(), this)); 603 new VisitedLinkMaster(visited_link_event_listener_.get(), this));
604 if (!visited_links->Init()) 604 if (!visited_links->Init())
605 return NULL; 605 return NULL;
606 visited_link_master_.swap(visited_links); 606 visited_link_master_.swap(visited_links);
607 } 607 }
608 608
609 return visited_link_master_.get(); 609 return visited_link_master_.get();
610 } 610 }
611 611
612 ExtensionsService* ProfileImpl::GetExtensionsService() { 612 ExtensionService* ProfileImpl::GetExtensionService() {
613 return extensions_service_.get(); 613 return extensions_service_.get();
614 } 614 }
615 615
616 BackgroundContentsService* ProfileImpl::GetBackgroundContentsService() const { 616 BackgroundContentsService* ProfileImpl::GetBackgroundContentsService() const {
617 return background_contents_service_.get(); 617 return background_contents_service_.get();
618 } 618 }
619 619
620 StatusTray* ProfileImpl::GetStatusTray() { 620 StatusTray* ProfileImpl::GetStatusTray() {
621 if (!status_tray_.get()) 621 if (!status_tray_.get())
622 status_tray_.reset(StatusTray::Create()); 622 status_tray_.reset(StatusTray::Create());
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 prefs_->GetBoolean(prefs::kSessionExitedCleanly); 682 prefs_->GetBoolean(prefs::kSessionExitedCleanly);
683 // Mark the session as open. 683 // Mark the session as open.
684 prefs_->SetBoolean(prefs::kSessionExitedCleanly, false); 684 prefs_->SetBoolean(prefs::kSessionExitedCleanly, false);
685 // Make sure we save to disk that the session has opened. 685 // Make sure we save to disk that the session has opened.
686 prefs_->ScheduleSavePersistentPrefs(); 686 prefs_->ScheduleSavePersistentPrefs();
687 687
688 // Ensure that preferences set by extensions are restored in the profile 688 // Ensure that preferences set by extensions are restored in the profile
689 // as early as possible. The constructor takes care of that. 689 // as early as possible. The constructor takes care of that.
690 extension_prefs_.reset(new ExtensionPrefs( 690 extension_prefs_.reset(new ExtensionPrefs(
691 prefs_.get(), 691 prefs_.get(),
692 GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName), 692 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
693 extension_pref_store)); 693 extension_pref_store));
694 694
695 DCHECK(!net_pref_observer_.get()); 695 DCHECK(!net_pref_observer_.get());
696 net_pref_observer_.reset(new NetPrefObserver(prefs_.get())); 696 net_pref_observer_.reset(new NetPrefObserver(prefs_.get()));
697 } 697 }
698 698
699 return prefs_.get(); 699 return prefs_.get();
700 } 700 }
701 701
702 FilePath ProfileImpl::GetPrefFilePath() { 702 FilePath ProfileImpl::GetPrefFilePath() {
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 } 1359 }
1360 1360
1361 PrerenderManager* ProfileImpl::GetPrerenderManager() { 1361 PrerenderManager* ProfileImpl::GetPrerenderManager() {
1362 CommandLine* cl = CommandLine::ForCurrentProcess(); 1362 CommandLine* cl = CommandLine::ForCurrentProcess();
1363 if (!cl->HasSwitch(switches::kEnablePagePrerender)) 1363 if (!cl->HasSwitch(switches::kEnablePagePrerender))
1364 return NULL; 1364 return NULL;
1365 if (!prerender_manager_.get()) 1365 if (!prerender_manager_.get())
1366 prerender_manager_.reset(new PrerenderManager(this)); 1366 prerender_manager_.reset(new PrerenderManager(this));
1367 return prerender_manager_.get(); 1367 return prerender_manager_.get();
1368 } 1368 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698