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

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

Issue 159085: Re-enable extensions auto-update. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 user_script_master_ = new UserScriptMaster( 553 user_script_master_ = new UserScriptMaster(
554 g_browser_process->file_thread()->message_loop(), 554 g_browser_process->file_thread()->message_loop(),
555 script_dir); 555 script_dir);
556 extensions_service_ = new ExtensionsService( 556 extensions_service_ = new ExtensionsService(
557 this, 557 this,
558 CommandLine::ForCurrentProcess(), 558 CommandLine::ForCurrentProcess(),
559 GetPrefs(), 559 GetPrefs(),
560 GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName), 560 GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName),
561 MessageLoop::current(), 561 MessageLoop::current(),
562 g_browser_process->file_thread()->message_loop(), 562 g_browser_process->file_thread()->message_loop(),
563 false); 563 true);
564 564
565 extensions_service_->Init(); 565 extensions_service_->Init();
566 566
567 // Load any extensions specified with --load-extension. 567 // Load any extensions specified with --load-extension.
568 if (command_line->HasSwitch(switches::kLoadExtension)) { 568 if (command_line->HasSwitch(switches::kLoadExtension)) {
569 std::wstring path_string = 569 std::wstring path_string =
570 command_line->GetSwitchValue(switches::kLoadExtension); 570 command_line->GetSwitchValue(switches::kLoadExtension);
571 FilePath path = FilePath::FromWStringHack(path_string); 571 FilePath path = FilePath::FromWStringHack(path_string);
572 extensions_service_->LoadExtension(path); 572 extensions_service_->LoadExtension(path);
573 573
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 1163
1164 void ProfileImpl::StopCreateSessionServiceTimer() { 1164 void ProfileImpl::StopCreateSessionServiceTimer() {
1165 create_session_service_timer_.Stop(); 1165 create_session_service_timer_.Stop();
1166 } 1166 }
1167 1167
1168 #ifdef CHROME_PERSONALIZATION 1168 #ifdef CHROME_PERSONALIZATION
1169 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { 1169 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
1170 return personalization_.get(); 1170 return personalization_.get();
1171 } 1171 }
1172 #endif 1172 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698