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/browser_process_impl.h

Issue 1289423002: Add webusb notification UI code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added some #ifdef flags Created 5 years, 4 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 // When each service is created, we set a flag indicating this. At this point, 5 // When each service is created, we set a flag indicating this. At this point,
6 // the service initialization could fail or succeed. This allows us to remember 6 // the service initialization could fail or succeed. This allows us to remember
7 // if we tried to create a service, and not try creating it over and over if 7 // if we tried to create a service, and not try creating it over and over if
8 // the creation failed. 8 // the creation failed.
9 9
10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 namespace gcm { 45 namespace gcm {
46 class GCMDriver; 46 class GCMDriver;
47 } 47 }
48 48
49 namespace policy { 49 namespace policy {
50 class BrowserPolicyConnector; 50 class BrowserPolicyConnector;
51 class PolicyService; 51 class PolicyService;
52 }; 52 };
53 53
54 namespace webusb {
55 class WebUsbBrowserClient;
56 };
57
54 // Real implementation of BrowserProcess that creates and returns the services. 58 // Real implementation of BrowserProcess that creates and returns the services.
55 class BrowserProcessImpl : public BrowserProcess, 59 class BrowserProcessImpl : public BrowserProcess,
56 public base::NonThreadSafe { 60 public base::NonThreadSafe {
57 public: 61 public:
58 // |local_state_task_runner| must be a shutdown-blocking task runner. 62 // |local_state_task_runner| must be a shutdown-blocking task runner.
59 BrowserProcessImpl(base::SequencedTaskRunner* local_state_task_runner, 63 BrowserProcessImpl(base::SequencedTaskRunner* local_state_task_runner,
60 const base::CommandLine& command_line); 64 const base::CommandLine& command_line);
61 ~BrowserProcessImpl() override; 65 ~BrowserProcessImpl() override;
62 66
63 // Called before the browser threads are created. 67 // Called before the browser threads are created.
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 #endif 318 #endif
315 319
316 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) 320 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
317 // Any change to this #ifdef must be reflected as well in 321 // Any change to this #ifdef must be reflected as well in
318 // chrome/browser/memory/oom_priority_manager_browsertest.cc 322 // chrome/browser/memory/oom_priority_manager_browsertest.cc
319 scoped_ptr<memory::OomPriorityManager> oom_priority_manager_; 323 scoped_ptr<memory::OomPriorityManager> oom_priority_manager_;
320 #endif 324 #endif
321 325
322 ShellIntegration::DefaultWebClientState cached_default_web_client_state_; 326 ShellIntegration::DefaultWebClientState cached_default_web_client_state_;
323 327
328 #if !defined(OS_ANDROID) && !defined(OS_IOS)
329 scoped_ptr<webusb::WebUsbBrowserClient> webusb_browser_client_;
330 #endif
331
324 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); 332 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
325 }; 333 };
326 334
327 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 335 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698