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

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

Issue 497563002: [Android] Use correct enhanced bookmarks enabling logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: indent fix Created 6 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
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 return parameters_; 89 return parameters_;
90 } 90 }
91 const base::CommandLine& parsed_command_line() const { 91 const base::CommandLine& parsed_command_line() const {
92 return parsed_command_line_; 92 return parsed_command_line_;
93 } 93 }
94 94
95 Profile* profile() { return profile_; } 95 Profile* profile() { return profile_; }
96 96
97 const PrefService* local_state() const { return local_state_; } 97 const PrefService* local_state() const { return local_state_; }
98 98
99 protected:
100 PrefService* local_state() { return local_state_; }
101
99 private: 102 private:
100 // Methods for |SetupMetricsAndFieldTrials()| -------------------------------- 103 // Methods for |SetupMetricsAndFieldTrials()| --------------------------------
101 104
102 // Constructs metrics service and does related initialization, including 105 // Constructs metrics service and does related initialization, including
103 // creation of field trials. Call only after labs have been converted to 106 // creation of field trials. Call only after labs have been converted to
104 // switches. 107 // switches.
105 void SetupMetricsAndFieldTrials(); 108 void SetupMetricsAndFieldTrials();
106 109
107 // Starts recording of metrics. This can only be called after we have a file 110 // Starts recording of metrics. This can only be called after we have a file
108 // thread. 111 // thread.
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 bool restart_last_session_; 196 bool restart_last_session_;
194 197
195 // Tests can set this to true to disable restricting cookie access in the 198 // Tests can set this to true to disable restricting cookie access in the
196 // network stack, as this can only be done once. 199 // network stack, as this can only be done once.
197 static bool disable_enforcing_cookie_policies_for_tests_; 200 static bool disable_enforcing_cookie_policies_for_tests_;
198 201
199 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts); 202 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
200 }; 203 };
201 204
202 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 205 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698