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

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

Issue 1289423002: Add webusb notification UI code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use USB_DEVICE_NAME instead of USB_DEVICE_PRODUCT_NAME in generated_resources.grd Created 5 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 27 matching lines...) Expand all
38 38
39 #if defined(OS_WIN) 39 #if defined(OS_WIN)
40 extern const char kMissingLocaleDataMessage[]; 40 extern const char kMissingLocaleDataMessage[];
41 #endif 41 #endif
42 } 42 }
43 43
44 namespace metrics { 44 namespace metrics {
45 class TrackingSynchronizer; 45 class TrackingSynchronizer;
46 } 46 }
47 47
48 namespace webusb {
49 class WebUsbBrowserClient;
50 class WebUsbDetector;
51 }
52
48 class ChromeBrowserMainParts : public content::BrowserMainParts { 53 class ChromeBrowserMainParts : public content::BrowserMainParts {
49 public: 54 public:
50 ~ChromeBrowserMainParts() override; 55 ~ChromeBrowserMainParts() override;
51 56
52 // Add additional ChromeBrowserMainExtraParts. 57 // Add additional ChromeBrowserMainExtraParts.
53 virtual void AddParts(ChromeBrowserMainExtraParts* parts); 58 virtual void AddParts(ChromeBrowserMainExtraParts* parts);
54 59
55 protected: 60 protected:
56 explicit ChromeBrowserMainParts( 61 explicit ChromeBrowserMainParts(
57 const content::MainFunctionParams& parameters); 62 const content::MainFunctionParams& parameters);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 136
132 // Statistical testing infrastructure for the entire browser. NULL until 137 // Statistical testing infrastructure for the entire browser. NULL until
133 // SetupMetricsAndFieldTrials is called. 138 // SetupMetricsAndFieldTrials is called.
134 scoped_ptr<base::FieldTrialList> field_trial_list_; 139 scoped_ptr<base::FieldTrialList> field_trial_list_;
135 140
136 ChromeBrowserFieldTrials browser_field_trials_; 141 ChromeBrowserFieldTrials browser_field_trials_;
137 142
138 #if !defined(OS_ANDROID) && !defined(OS_IOS) 143 #if !defined(OS_ANDROID) && !defined(OS_IOS)
139 // A monitor for attributing power consumption to origins. 144 // A monitor for attributing power consumption to origins.
140 scoped_ptr<ProcessPowerCollector> process_power_collector_; 145 scoped_ptr<ProcessPowerCollector> process_power_collector_;
146
147 scoped_ptr<webusb::WebUsbBrowserClient> webusb_browser_client_;
148 scoped_ptr<webusb::WebUsbDetector> webusb_detector_;
141 #endif 149 #endif
142 150
143 // Vector of additional ChromeBrowserMainExtraParts. 151 // Vector of additional ChromeBrowserMainExtraParts.
144 // Parts are deleted in the inverse order they are added. 152 // Parts are deleted in the inverse order they are added.
145 std::vector<ChromeBrowserMainExtraParts*> chrome_extra_parts_; 153 std::vector<ChromeBrowserMainExtraParts*> chrome_extra_parts_;
146 154
147 // A profiler that periodically samples stack traces. Used to sample startup 155 // A profiler that periodically samples stack traces. Used to sample startup
148 // behavior. 156 // behavior.
149 base::StackSamplingProfiler sampling_profiler_; 157 base::StackSamplingProfiler sampling_profiler_;
150 158
(...skipping 25 matching lines...) Expand all
176 PrefService* local_state_; 184 PrefService* local_state_;
177 base::FilePath user_data_dir_; 185 base::FilePath user_data_dir_;
178 186
179 // Members needed across shutdown methods. 187 // Members needed across shutdown methods.
180 bool restart_last_session_; 188 bool restart_last_session_;
181 189
182 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts); 190 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
183 }; 191 };
184 192
185 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 193 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698