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

Side by Side Diff: chrome/browser/profile.cc

Issue 140018: Make ExtensionPrefs paths relative, re-enable 2 ExtensionsService unit_tests (Closed)
Patch Set: final changes Created 11 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/profile.h" 5 #include "chrome/browser/profile.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 script_dir = GetPath(); 487 script_dir = GetPath();
488 script_dir = script_dir.Append(chrome::kUserScriptsDirname); 488 script_dir = script_dir.Append(chrome::kUserScriptsDirname);
489 } 489 }
490 } 490 }
491 491
492 ExtensionErrorReporter::Init(true); // allow noisy errors. 492 ExtensionErrorReporter::Init(true); // allow noisy errors.
493 user_script_master_ = new UserScriptMaster( 493 user_script_master_ = new UserScriptMaster(
494 g_browser_process->file_thread()->message_loop(), 494 g_browser_process->file_thread()->message_loop(),
495 script_dir); 495 script_dir);
496 extensions_service_ = new ExtensionsService( 496 extensions_service_ = new ExtensionsService(
497 this, CommandLine::ForCurrentProcess(), MessageLoop::current(), 497 this,
498 CommandLine::ForCurrentProcess(),
499 GetPrefs(),
500 GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName),
501 MessageLoop::current(),
498 g_browser_process->file_thread()->message_loop()); 502 g_browser_process->file_thread()->message_loop());
499 503
500 extensions_service_->Init(); 504 extensions_service_->Init();
501 } 505 }
502 506
503 void ProfileImpl::InitWebResources() { 507 void ProfileImpl::InitWebResources() {
504 web_resource_service_ = new WebResourceService( 508 web_resource_service_ = new WebResourceService(
505 this, 509 this,
506 g_browser_process->file_thread()->message_loop()); 510 g_browser_process->file_thread()->message_loop());
507 511
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 1098
1095 void ProfileImpl::StopCreateSessionServiceTimer() { 1099 void ProfileImpl::StopCreateSessionServiceTimer() {
1096 create_session_service_timer_.Stop(); 1100 create_session_service_timer_.Stop();
1097 } 1101 }
1098 1102
1099 #ifdef CHROME_PERSONALIZATION 1103 #ifdef CHROME_PERSONALIZATION
1100 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { 1104 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
1101 return personalization_.get(); 1105 return personalization_.get();
1102 } 1106 }
1103 #endif 1107 #endif
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extensions_service_unittest.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698