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

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

Issue 7326011: Revert 91842 - Introduce a policy to control the maximal number of connections per proxy server. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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/app/policy/policy_templates.json ('k') | chrome/browser/browser_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
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 #ifndef CHROME_BROWSER_BROWSER_MAIN_H_ 5 #ifndef CHROME_BROWSER_BROWSER_MAIN_H_
6 #define CHROME_BROWSER_BROWSER_MAIN_H_ 6 #define CHROME_BROWSER_BROWSER_MAIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 void InitializeMainThread(); 141 void InitializeMainThread();
142 142
143 // Methods for |SetupMetricsAndFieldTrials()| -------------------------------- 143 // Methods for |SetupMetricsAndFieldTrials()| --------------------------------
144 144
145 static MetricsService* InitializeMetrics( 145 static MetricsService* InitializeMetrics(
146 const CommandLine& parsed_command_line, 146 const CommandLine& parsed_command_line,
147 const PrefService* local_state); 147 const PrefService* local_state);
148 148
149 // Add an invocation of your field trial init function to this method. 149 // Add an invocation of your field trial init function to this method.
150 void SetupFieldTrials(bool metrics_recording_enabled, 150 void SetupFieldTrials(bool metrics_recording_enabled);
151 bool proxy_policy_is_set);
152 151
153 // Members initialized on construction --------------------------------------- 152 // Members initialized on construction ---------------------------------------
154 153
155 const MainFunctionParams& parameters_; 154 const MainFunctionParams& parameters_;
156 const CommandLine& parsed_command_line_; 155 const CommandLine& parsed_command_line_;
157 156
158 #if defined(TRACK_ALL_TASK_OBJECTS) 157 #if defined(TRACK_ALL_TASK_OBJECTS)
159 // Creating this object starts tracking the creation and deletion of Task 158 // Creating this object starts tracking the creation and deletion of Task
160 // instance. This MUST be done before main_message_loop, so that it is 159 // instance. This MUST be done before main_message_loop, so that it is
161 // destroyed after the main_message_loop. 160 // destroyed after the main_message_loop.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 194
196 // Displays a warning message if some minimum level of OS support is not 195 // Displays a warning message if some minimum level of OS support is not
197 // present on the current platform. 196 // present on the current platform.
198 void WarnAboutMinimumSystemRequirements(); 197 void WarnAboutMinimumSystemRequirements();
199 198
200 // Records the time from our process' startup to the present time in 199 // Records the time from our process' startup to the present time in
201 // the UMA histogram |metric_name|. 200 // the UMA histogram |metric_name|.
202 void RecordBrowserStartupTime(); 201 void RecordBrowserStartupTime();
203 202
204 #endif // CHROME_BROWSER_BROWSER_MAIN_H_ 203 #endif // CHROME_BROWSER_BROWSER_MAIN_H_
OLDNEW
« no previous file with comments | « chrome/app/policy/policy_templates.json ('k') | chrome/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698