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

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

Issue 6894020: Adds async interface method to PersistentPrefStore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use Notifications. Created 9 years, 7 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 // Checking that the local state file for the current profile doesn't exist 709 // Checking that the local state file for the current profile doesn't exist
710 // is the most robust way to determine whether we need to inherit or not 710 // is the most robust way to determine whether we need to inherit or not
711 // since the parent profile command line flag can be present even when the 711 // since the parent profile command line flag can be present even when the
712 // current profile is not a new one, and in that case we do not want to 712 // current profile is not a new one, and in that case we do not want to
713 // inherit and reset the user's setting. 713 // inherit and reset the user's setting.
714 if (!local_state_file_exists && 714 if (!local_state_file_exists &&
715 parsed_command_line.HasSwitch(switches::kParentProfile)) { 715 parsed_command_line.HasSwitch(switches::kParentProfile)) {
716 FilePath parent_profile = 716 FilePath parent_profile =
717 parsed_command_line.GetSwitchValuePath(switches::kParentProfile); 717 parsed_command_line.GetSwitchValuePath(switches::kParentProfile);
718 scoped_ptr<PrefService> parent_local_state( 718 scoped_ptr<PrefService> parent_local_state(
719 PrefService::CreatePrefService(parent_profile, NULL, NULL)); 719 PrefService::CreatePrefService(parent_profile, NULL, NULL, false));
720 parent_local_state->RegisterStringPref(prefs::kApplicationLocale, 720 parent_local_state->RegisterStringPref(prefs::kApplicationLocale,
721 std::string()); 721 std::string());
722 // Right now, we only inherit the locale setting from the parent profile. 722 // Right now, we only inherit the locale setting from the parent profile.
723 local_state->SetString( 723 local_state->SetString(
724 prefs::kApplicationLocale, 724 prefs::kApplicationLocale,
725 parent_local_state->GetString(prefs::kApplicationLocale)); 725 parent_local_state->GetString(prefs::kApplicationLocale));
726 } 726 }
727 727
728 #if defined(OS_CHROMEOS) 728 #if defined(OS_CHROMEOS)
729 if (parsed_command_line.HasSwitch(switches::kLoginManager)) { 729 if (parsed_command_line.HasSwitch(switches::kLoginManager)) {
(...skipping 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1892 #if defined(OS_CHROMEOS) 1892 #if defined(OS_CHROMEOS)
1893 // To be precise, logout (browser shutdown) is not yet done, but the 1893 // To be precise, logout (browser shutdown) is not yet done, but the
1894 // remaining work is negligible, hence we say LogoutDone here. 1894 // remaining work is negligible, hence we say LogoutDone here.
1895 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1895 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1896 false); 1896 false);
1897 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1897 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1898 #endif 1898 #endif
1899 TRACE_EVENT_END("BrowserMain", 0, 0); 1899 TRACE_EVENT_END("BrowserMain", 0, 0);
1900 return result_code; 1900 return result_code;
1901 } 1901 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_process_impl.cc » ('j') | chrome/browser/prefs/pref_notifier_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698