| OLD | NEW |
| 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 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 script_dir = GetPath(); | 471 script_dir = GetPath(); |
| 472 script_dir = script_dir.Append(chrome::kUserScriptsDirname); | 472 script_dir = script_dir.Append(chrome::kUserScriptsDirname); |
| 473 } | 473 } |
| 474 } | 474 } |
| 475 | 475 |
| 476 ExtensionErrorReporter::Init(true); // allow noisy errors. | 476 ExtensionErrorReporter::Init(true); // allow noisy errors. |
| 477 user_script_master_ = new UserScriptMaster( | 477 user_script_master_ = new UserScriptMaster( |
| 478 g_browser_process->file_thread()->message_loop(), | 478 g_browser_process->file_thread()->message_loop(), |
| 479 script_dir); | 479 script_dir); |
| 480 extensions_service_ = new ExtensionsService( | 480 extensions_service_ = new ExtensionsService( |
| 481 this, MessageLoop::current(), | 481 this, CommandLine::ForCurrentProcess(), MessageLoop::current(), |
| 482 g_browser_process->file_thread()->message_loop()); | 482 g_browser_process->file_thread()->message_loop()); |
| 483 | 483 |
| 484 extensions_service_->Init(); | 484 extensions_service_->Init(); |
| 485 } | 485 } |
| 486 | 486 |
| 487 void ProfileImpl::InitWebResources() { | 487 void ProfileImpl::InitWebResources() { |
| 488 web_resource_service_ = new WebResourceService( | 488 web_resource_service_ = new WebResourceService( |
| 489 this, | 489 this, |
| 490 g_browser_process->file_thread()->message_loop()); | 490 g_browser_process->file_thread()->message_loop()); |
| 491 | 491 |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1070 | 1070 |
| 1071 void ProfileImpl::StopCreateSessionServiceTimer() { | 1071 void ProfileImpl::StopCreateSessionServiceTimer() { |
| 1072 create_session_service_timer_.Stop(); | 1072 create_session_service_timer_.Stop(); |
| 1073 } | 1073 } |
| 1074 | 1074 |
| 1075 #ifdef CHROME_PERSONALIZATION | 1075 #ifdef CHROME_PERSONALIZATION |
| 1076 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { | 1076 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { |
| 1077 return personalization_.get(); | 1077 return personalization_.get(); |
| 1078 } | 1078 } |
| 1079 #endif | 1079 #endif |
| OLD | NEW |