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

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

Issue 7827033: Introduce net::HttpServerPropertiesManager to manage server-specific properties. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 1680 matching lines...) Expand 10 before | Expand all | Expand 10 after
1691 1691
1692 #if defined(OS_CHROMEOS) 1692 #if defined(OS_CHROMEOS)
1693 // Initialize the screen locker now so that it can receive 1693 // Initialize the screen locker now so that it can receive
1694 // LOGIN_USER_CHANGED notification from UserManager. 1694 // LOGIN_USER_CHANGED notification from UserManager.
1695 chromeos::ScreenLocker::InitClass(); 1695 chromeos::ScreenLocker::InitClass();
1696 1696
1697 // This forces the ProfileManager to be created and register for the 1697 // This forces the ProfileManager to be created and register for the
1698 // notification it needs to track the logged in user. 1698 // notification it needs to track the logged in user.
1699 g_browser_process->profile_manager(); 1699 g_browser_process->profile_manager();
1700 1700
1701 // This forces the SpdyConfigServiceManager to be created so that SPDY config
1702 // data is loaded from user_profile.
1703 g_browser_process->spdy_config_service_manager();
1704
1701 // TODO(abarth): Should this move to InitializeNetworkOptions()? 1705 // TODO(abarth): Should this move to InitializeNetworkOptions()?
1702 // Allow access to file:// on ChromeOS for tests. 1706 // Allow access to file:// on ChromeOS for tests.
1703 if (parsed_command_line.HasSwitch(switches::kAllowFileAccess)) 1707 if (parsed_command_line.HasSwitch(switches::kAllowFileAccess))
1704 net::URLRequest::AllowFileAccess(); 1708 net::URLRequest::AllowFileAccess();
1705 1709
1706 // There are two use cases for kLoginUser: 1710 // There are two use cases for kLoginUser:
1707 // 1) if passed in tandem with kLoginPassword, to drive a "StubLogin" 1711 // 1) if passed in tandem with kLoginPassword, to drive a "StubLogin"
1708 // 2) if passed alone, to signal that the indicated user has already 1712 // 2) if passed alone, to signal that the indicated user has already
1709 // logged in and we should behave accordingly. 1713 // logged in and we should behave accordingly.
1710 // This handles case 2. 1714 // This handles case 2.
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
2201 std::string pre_read; 2205 std::string pre_read;
2202 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2206 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2203 (pre_read == "0" || pre_read == "1")) { 2207 (pre_read == "0" || pre_read == "1")) {
2204 std::string uma_name(name); 2208 std::string uma_name(name);
2205 uma_name += "_PreRead"; 2209 uma_name += "_PreRead";
2206 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2210 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2207 AddPreReadHistogramTime(uma_name.c_str(), time); 2211 AddPreReadHistogramTime(uma_name.c_str(), time);
2208 } 2212 }
2209 #endif 2213 #endif
2210 } 2214 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698