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

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

Issue 1562593002: Fix potential crashes in NetworkHandler code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test
Patch Set: Created 4 years, 11 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/macros.h" 8 #include "base/macros.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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 const content::MainFunctionParams& parameters() const { 91 const content::MainFunctionParams& parameters() const {
92 return parameters_; 92 return parameters_;
93 } 93 }
94 const base::CommandLine& parsed_command_line() const { 94 const base::CommandLine& parsed_command_line() const {
95 return parsed_command_line_; 95 return parsed_command_line_;
96 } 96 }
97 const base::FilePath& user_data_dir() const { 97 const base::FilePath& user_data_dir() const {
98 return user_data_dir_; 98 return user_data_dir_;
99 } 99 }
100 100
101 BrowserProcessImpl* browser_process() { return browser_process_.get(); }
stevenjb 2016/01/05 22:26:37 Note: this is protected.
sky 2016/01/05 23:17:11 Is there a reason you can't use g_browser_process?
stevenjb 2016/01/06 00:43:04 Duh. Done.
102
101 Profile* profile() { return profile_; } 103 Profile* profile() { return profile_; }
102 104
103 const PrefService* local_state() const { return local_state_; } 105 const PrefService* local_state() const { return local_state_; }
104 106
105 private: 107 private:
106 // Methods for |SetupMetricsAndFieldTrials()| -------------------------------- 108 // Methods for |SetupMetricsAndFieldTrials()| --------------------------------
107 109
108 // Constructs metrics service and does related initialization, including 110 // Constructs metrics service and does related initialization, including
109 // creation of field trials. Call only after labs have been converted to 111 // creation of field trials. Call only after labs have been converted to
110 // switches. 112 // switches.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 PrefService* local_state_; 194 PrefService* local_state_;
193 base::FilePath user_data_dir_; 195 base::FilePath user_data_dir_;
194 196
195 // Members needed across shutdown methods. 197 // Members needed across shutdown methods.
196 bool restart_last_session_; 198 bool restart_last_session_;
197 199
198 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts); 200 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
199 }; 201 };
200 202
201 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 203 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698