| 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/browser_init.h" | 5 #include "chrome/browser/browser_init.h" |
| 6 | 6 |
| 7 #include <shellapi.h> | 7 #include <shellapi.h> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 bool playback_mode = | 486 bool playback_mode = |
| 487 parsed_command_line.HasSwitch(switches::kPlaybackMode); | 487 parsed_command_line.HasSwitch(switches::kPlaybackMode); |
| 488 | 488 |
| 489 if (record_mode && chrome::kRecordModeEnabled) | 489 if (record_mode && chrome::kRecordModeEnabled) |
| 490 base::EventRecorder::current()->StartRecording(script_path); | 490 base::EventRecorder::current()->StartRecording(script_path); |
| 491 if (playback_mode) | 491 if (playback_mode) |
| 492 base::EventRecorder::current()->StartPlayback(script_path); | 492 base::EventRecorder::current()->StartPlayback(script_path); |
| 493 } | 493 } |
| 494 } | 494 } |
| 495 | 495 |
| 496 // Start up the extensions service | |
| 497 if (parsed_command_line.HasSwitch(switches::kEnableExtensions)) | |
| 498 profile->GetExtensionsService()->Init(); | |
| 499 | |
| 500 return true; | 496 return true; |
| 501 } | 497 } |
| 502 | 498 |
| 503 bool BrowserInit::LaunchWithProfile::OpenStartupURLs( | 499 bool BrowserInit::LaunchWithProfile::OpenStartupURLs( |
| 504 bool is_process_startup, | 500 bool is_process_startup, |
| 505 const CommandLine& command_line, | 501 const CommandLine& command_line, |
| 506 const std::vector<GURL>& urls_to_open) { | 502 const std::vector<GURL>& urls_to_open) { |
| 507 SessionStartupPref pref = GetSessionStartupPref(profile_, command_line); | 503 SessionStartupPref pref = GetSessionStartupPref(profile_, command_line); |
| 508 switch (pref.type) { | 504 switch (pref.type) { |
| 509 case SessionStartupPref::LAST: | 505 case SessionStartupPref::LAST: |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 if (!launched) { | 719 if (!launched) { |
| 724 LOG(ERROR) << "launch error"; | 720 LOG(ERROR) << "launch error"; |
| 725 if (return_code != NULL) { | 721 if (return_code != NULL) { |
| 726 *return_code = ResultCodes::INVALID_CMDLINE_URL; | 722 *return_code = ResultCodes::INVALID_CMDLINE_URL; |
| 727 } | 723 } |
| 728 return false; | 724 return false; |
| 729 } | 725 } |
| 730 | 726 |
| 731 return true; | 727 return true; |
| 732 } | 728 } |
| OLD | NEW |