Chrome To Mobile Service refactoring and polish, etc.

chrome/browser/chrome_to_mobile_service.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.
 
 #ifndef CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_
 #define CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
-#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/timer.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/common/net/gaia/oauth2_access_token_consumer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
@@ skipping 73 matching lines @@
   // 'enable' command line switches, otherwise relay the default enabled state.
   static bool IsChromeToMobileEnabled();
 
   // Register the user prefs associated with this service.
   static void RegisterUserPrefs(PrefService* prefs);
 
   explicit ChromeToMobileService(Profile* profile);
   virtual ~ChromeToMobileService();
 
   // Returns true if the service has found any registered mobile devices.
-  bool HasMobiles();
+  bool HasMobiles() const;
 
   // Get the non-NULL ListValue of mobile devices from the cloud print service.
   // The list is owned by PrefService, which outlives ChromeToMobileService.
   // Each device DictionaryValue contains strings "type", "name", and "id".
   // Virtual for unit test mocking.
   virtual const base::ListValue* GetMobiles() const;
 
   // Request an updated mobile device list, request auth first if needed.
   // Virtual for unit test mocking.
   virtual void RequestMobileListUpdate();
@@ skipping 30 matching lines @@
                        const content::NotificationDetails& details) OVERRIDE;
 
   // OAuth2AccessTokenConsumer methods.
   virtual void OnGetTokenSuccess(const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const GoogleServiceAuthError& error) OVERRIDE;
 
  private:
   friend class MockChromeToMobileService;
 
+  // Enable or disable Chrome To Mobile with the browsers' command controllers.
+  // The feature state is automatically derived from internal conditions.
+  void UpdateCommandState() const;
+
   // Handle the attempted creation of a temporary file for snapshot generation.
   // Alert the observer of failure or generate MHTML with an observer callback.
   void SnapshotFileCreated(base::WeakPtr<Observer> observer,
                            SessionID::id_type browser_id,
                            const FilePath& path,
                            bool success);
 
   // Create a cloud print job submission request for a URL or snapshot.
   net::URLFetcher* CreateRequest(const JobData& data);
 
-  // Initialize URLFetcher requests (search and jobs submit).
+  // Initialize cloud print URLFetcher requests.
   void InitRequest(net::URLFetcher* request);
 
   // Submit a cloud print job request with the requisite data.
   void SendRequest(net::URLFetcher* request, const JobData& data);
 
   // Send the OAuth2AccessTokenFetcher request.
   // Virtual for unit test mocking.
-  virtual void RefreshAccessToken();
+  virtual void RequestAccessToken();
 
   // Request account information to limit cloud print access to existing users.
   void RequestAccountInfo();
 
-  // Send the cloud print URLFetcher search request.
-  void RequestSearch();
+  // Send the cloud print URLFetcher device search request.
+  void RequestDeviceSearch();
 
   void HandleAccountInfoResponse();
   void HandleSearchResponse();
   void HandleSubmitResponse(const net::URLFetcher* source);
 
   base::WeakPtrFactory<ChromeToMobileService> weak_ptr_factory_;
 
   Profile* profile_;
 
   // Used to recieve TokenService notifications for GaiaOAuth2LoginRefreshToken.
@@ skipping 19 matching lines @@
   scoped_ptr<net::URLFetcher> account_info_request_;
   bool cloud_print_accessible_;
 
   // The pending mobile device search request.
   scoped_ptr<net::URLFetcher> search_request_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeToMobileService);
 };
 
 #endif  // CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_