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

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

Issue 8499021: UserPolicyCache only becomes ready after policy has been fetched. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed build-breaking typo Created 9 years, 1 month 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_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 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1534 parsed_command_line().GetSwitchValueASCII(switches::kLoginUser); 1534 parsed_command_line().GetSwitchValueASCII(switches::kLoginUser);
1535 VLOG(1) << "Relaunching browser for user: " << username; 1535 VLOG(1) << "Relaunching browser for user: " << username;
1536 chromeos::UserManager::Get()->UserLoggedIn(username); 1536 chromeos::UserManager::Get()->UserLoggedIn(username);
1537 1537
1538 // Redirects Chrome logging to the user data dir. 1538 // Redirects Chrome logging to the user data dir.
1539 logging::RedirectChromeLogging(parsed_command_line()); 1539 logging::RedirectChromeLogging(parsed_command_line());
1540 1540
1541 // Initialize user policy before creating the profile so the profile 1541 // Initialize user policy before creating the profile so the profile
1542 // initialization code sees policy settings. 1542 // initialization code sees policy settings.
1543 g_browser_process->browser_policy_connector()->InitializeUserPolicy( 1543 g_browser_process->browser_policy_connector()->InitializeUserPolicy(
1544 username); 1544 username, false /* wait_for_policy_fetch */);
1545 } 1545 }
1546 #endif 1546 #endif
1547 1547
1548 if (is_first_run) { 1548 if (is_first_run) {
1549 // Warn the ProfileManager that an import process will run, possibly 1549 // Warn the ProfileManager that an import process will run, possibly
1550 // locking the WebDataService directory of the next Profile created. 1550 // locking the WebDataService directory of the next Profile created.
1551 g_browser_process->profile_manager()->SetWillImport(); 1551 g_browser_process->profile_manager()->SetWillImport();
1552 } 1552 }
1553 1553
1554 profile_ = CreateProfile(parameters(), user_data_dir, parsed_command_line()); 1554 profile_ = CreateProfile(parameters(), user_data_dir, parsed_command_line());
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
2084 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2084 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2085 (pre_read == "0" || pre_read == "1")) { 2085 (pre_read == "0" || pre_read == "1")) {
2086 std::string uma_name(name); 2086 std::string uma_name(name);
2087 uma_name += "_PreRead"; 2087 uma_name += "_PreRead";
2088 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2088 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2089 AddPreReadHistogramTime(uma_name.c_str(), time); 2089 AddPreReadHistogramTime(uma_name.c_str(), time);
2090 } 2090 }
2091 #endif 2091 #endif
2092 #endif 2092 #endif
2093 } 2093 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_utils.cc » ('j') | chrome/browser/chromeos/login/login_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698