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

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

Issue 149481: Instead of forcing the homepage to be linux splash, force the startup action ... (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 | « chrome/browser/browser_main.cc ('k') | 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 std::wstring option = CommandLine::ForCurrentProcess()->GetSwitchValue( 515 std::wstring option = CommandLine::ForCurrentProcess()->GetSwitchValue(
516 switches::kPrivacyBlacklist); 516 switches::kPrivacyBlacklist);
517 #if defined(OS_POSIX) 517 #if defined(OS_POSIX)
518 FilePath path(WideToUTF8(option)); 518 FilePath path(WideToUTF8(option));
519 #else 519 #else
520 FilePath path(option); 520 FilePath path(option);
521 #endif 521 #endif
522 blacklist_ = new Blacklist(path); 522 blacklist_ = new Blacklist(path);
523 } 523 }
524 524
525 #if defined(OS_LINUX)
526 // TODO(port): Remove ifdef when the Linux splash page is not needed.
527 prefs->transient()->SetString(prefs::kHomePage, "about:linux-splash");
528 prefs->transient()->SetBoolean(prefs::kHomePageIsNewTabPage, false);
529 #endif
530
531 // Listen for theme installation. 525 // Listen for theme installation.
532 registrar_.Add(this, NotificationType::THEME_INSTALLED, 526 registrar_.Add(this, NotificationType::THEME_INSTALLED,
533 NotificationService::AllSources()); 527 NotificationService::AllSources());
534 } 528 }
535 529
536 void ProfileImpl::InitExtensions() { 530 void ProfileImpl::InitExtensions() {
537 if (user_script_master_ || extensions_service_) 531 if (user_script_master_ || extensions_service_)
538 return; // Already initialized. 532 return; // Already initialized.
539 533
540 const CommandLine* command_line = CommandLine::ForCurrentProcess(); 534 const CommandLine* command_line = CommandLine::ForCurrentProcess();
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 1147
1154 void ProfileImpl::StopCreateSessionServiceTimer() { 1148 void ProfileImpl::StopCreateSessionServiceTimer() {
1155 create_session_service_timer_.Stop(); 1149 create_session_service_timer_.Stop();
1156 } 1150 }
1157 1151
1158 #ifdef CHROME_PERSONALIZATION 1152 #ifdef CHROME_PERSONALIZATION
1159 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { 1153 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
1160 return personalization_.get(); 1154 return personalization_.get();
1161 } 1155 }
1162 #endif 1156 #endif
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698