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

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

Issue 856733004: Loading the Launcher with a Locked Profile launched UserManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted@: test fixes and remove a const-ref. Created 5 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main_mac.mm » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CHROME_BROWSER_MAIN_H_ 5 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 // Displays a warning message that we can't find any locale data files. 81 // Displays a warning message that we can't find any locale data files.
82 virtual void ShowMissingLocaleMessageBox() = 0; 82 virtual void ShowMissingLocaleMessageBox() = 0;
83 83
84 const content::MainFunctionParams& parameters() const { 84 const content::MainFunctionParams& parameters() const {
85 return parameters_; 85 return parameters_;
86 } 86 }
87 const base::CommandLine& parsed_command_line() const { 87 const base::CommandLine& parsed_command_line() const {
88 return parsed_command_line_; 88 return parsed_command_line_;
89 } 89 }
90 const base::FilePath& user_data_dir() const {
91 return user_data_dir_;
92 }
90 93
91 Profile* profile() { return profile_; } 94 Profile* profile() { return profile_; }
92 95
93 const PrefService* local_state() const { return local_state_; } 96 const PrefService* local_state() const { return local_state_; }
94 97
95 private: 98 private:
96 // Methods for |SetupMetricsAndFieldTrials()| -------------------------------- 99 // Methods for |SetupMetricsAndFieldTrials()| --------------------------------
97 100
98 // Constructs metrics service and does related initialization, including 101 // Constructs metrics service and does related initialization, including
99 // creation of field trials. Call only after labs have been converted to 102 // creation of field trials. Call only after labs have been converted to
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 bool restart_last_session_; 186 bool restart_last_session_;
184 187
185 // Tests can set this to true to disable restricting cookie access in the 188 // Tests can set this to true to disable restricting cookie access in the
186 // network stack, as this can only be done once. 189 // network stack, as this can only be done once.
187 static bool disable_enforcing_cookie_policies_for_tests_; 190 static bool disable_enforcing_cookie_policies_for_tests_;
188 191
189 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts); 192 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
190 }; 193 };
191 194
192 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 195 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698