Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / browser_process_impl.h

diff --git a/src/chrome/browser/browser_process_impl.h b/src/chrome/browser/browser_process_impl.h
index 4899cc3..937f813 100644 (file)
--- a/src/chrome/browser/browser_process_impl.h
+++ b/src/chrome/browser/browser_process_impl.h
@@ -21,9 +21,9 @@
 #include "base/timer/timer.h"
 #include "chrome/browser/browser_process.h"
 
+class ChromeDeviceClient;
 class ChromeNetLog;
 class ChromeResourceDispatcherHostDelegate;
-class MetricsServicesManager;
 class RemoteDebuggingServer;
 class PrefRegistrySimple;
 class PromoResourceService;
@@ -78,7 +78,7 @@ class BrowserProcessImpl : public BrowserProcess,
   virtual void ResourceDispatcherHostCreated() OVERRIDE;
   virtual void EndSession() OVERRIDE;
   virtual MetricsServicesManager* GetMetricsServicesManager() OVERRIDE;
-  virtual MetricsService* metrics_service() OVERRIDE;
+  virtual metrics::MetricsService* metrics_service() OVERRIDE;
   virtual rappor::RapporService* rappor_service() OVERRIDE;
   virtual IOThread* io_thread() OVERRIDE;
   virtual WatchDogThread* watchdog_thread() OVERRIDE;
@@ -276,8 +276,11 @@ class BrowserProcessImpl : public BrowserProcess,
   // but some users of component updater only install per-user.
   scoped_ptr<component_updater::ComponentUpdateService> component_updater_;
   scoped_refptr<CRLSetFetcher> crl_set_fetcher_;
+
+#if !defined(DISABLE_NACL)
   scoped_ptr<component_updater::PnaclComponentInstaller>
       pnacl_component_installer_;
+#endif
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   scoped_refptr<PluginsResourceService> plugins_resource_service_;
@@ -298,6 +301,10 @@ class BrowserProcessImpl : public BrowserProcess,
 
   scoped_ptr<gcm::GCMDriver> gcm_driver_;
 
+#if !defined(OS_ANDROID)
+  scoped_ptr<ChromeDeviceClient> device_client_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };