Adding UsbService and UsbDevice constructs.

chrome/browser/profiles/profile_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_impl_io_data.h"
+#include "chrome/browser/usb/usb_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class ExtensionNavigationObserver;
 class ExtensionSystem;
 class NetPrefObserver;
 class PrefService;
 class SSLConfigServiceManager;
 class VisitedLinkEventListener;
 
@@ skipping 75 matching lines @@
   virtual void MarkAsCleanShutdown() OVERRIDE;
   virtual void InitPromoResources() OVERRIDE;
   virtual void InitRegisteredProtocolHandlers() OVERRIDE;
   virtual FilePath last_selected_directory() OVERRIDE;
   virtual void set_last_selected_directory(const FilePath& path) OVERRIDE;
   virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
   virtual void ClearNetworkingHistorySince(base::Time time) OVERRIDE;
   virtual GURL GetHomePage() OVERRIDE;
   virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE;
 
+#if !defined(OS_ANDROID)
+  virtual UsbService *GetUsbService() OVERRIDE;
+#endif  // !defined(OS_ANDROID)
+
 #if defined(OS_CHROMEOS)
   virtual void ChangeAppLocale(const std::string& locale,
                                AppLocaleChangedVia) OVERRIDE;
   virtual void OnLogin() OVERRIDE;
   virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;
   virtual void InitChromeOSPreferences() OVERRIDE;
 #endif  // defined(OS_CHROMEOS)
 
   virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;
 
@@ skipping 87 matching lines @@
 
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<content::GeolocationPermissionContext>
       geolocation_permission_context_;
   scoped_refptr<content::SpeechRecognitionPreferences>
       speech_recognition_preferences_;
   scoped_ptr<GAIAInfoUpdateService> gaia_info_update_service_;
   scoped_refptr<HistoryService> history_service_;
   scoped_ptr<FaviconService> favicon_service_;
   scoped_ptr<AutocompleteClassifier> autocomplete_classifier_;
+  scoped_ptr<UsbService> usb_service_;

[Elliot Glaysher, 2012/04/25 21:10:20]

NACK.

This exactly the sort of thing we're trying to avoid.
https://sites.google.com/a/chromium.org/dev/developers/design-documents/profi...

[Garret Kelly, 2012/04/25 21:15:17]

Oops! My mistake. Thank you for the pointer. Fixing now.

[miket_OOO, 2012/04/25 21:24:36]

Shouldn't this (and the include) be guarded with the OS_ANDROID constant, too?
Or are you OK with the pointer being there but not accessible? (I'm OK either
way, just want to make sure it's not a mistake.)

   scoped_refptr<history::ShortcutsBackend> shortcuts_backend_;
   scoped_refptr<WebDataService> web_data_service_;
   bool history_service_created_;
   bool favicon_service_created_;
   bool created_web_data_service_;
   bool clear_local_state_on_exit_;
 
   // Whether or not the last session exited cleanly. This is set only once.
   bool last_session_exited_cleanly_;
 
@@ skipping 36 matching lines @@
   Profile::Delegate* delegate_;
 
   chrome_browser_net::Predictor* predictor_;
 
   bool session_restore_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_