Integrate Chrome To Mobile with Action Box UI.

chrome/browser/chrome_to_mobile_service.cc

 // 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.
 
 #include "chrome/browser/chrome_to_mobile_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/guid.h"
@@ skipping 30 matching lines @@
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "sync/notifier/invalidation_util.h"
 
 namespace {
 
-// The default enabled/disabled state of the Chrome To Mobile feature.
-const bool kChromeToMobileEnabled = true;
-
 // The maximum number of retries for the URLFetcher requests.
 const size_t kMaxRetries = 1;
 
 // The number of hours to delay before retrying authentication on failure.
 const size_t kAuthRetryDelayHours = 6;
 
 // The number of hours before subsequent search requests are allowed.
 // This value is used to throttle expensive cloud print search requests.
 // Note that this limitation does not hold across application restarts.
 const int kSearchRequestDelayHours = 24;
@@ skipping 94 matching lines @@
 }  // namespace
 
 ChromeToMobileService::Observer::~Observer() {}
 
 ChromeToMobileService::JobData::JobData() : mobile_os(ANDROID), type(URL) {}
 
 ChromeToMobileService::JobData::~JobData() {}
 
 // static
 bool ChromeToMobileService::IsChromeToMobileEnabled() {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-
-  if (command_line->HasSwitch(switches::kDisableChromeToMobile))
-    return false;
-
-  if (command_line->HasSwitch(switches::kEnableChromeToMobile))
-    return true;
-
-  return kChromeToMobileEnabled;
+  // Chrome To Mobile is currently gated on the Action Box UI.
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableActionBox);
 }
 
 // static
 void ChromeToMobileService::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterListPref(prefs::kChromeToMobileDeviceList,
                           PrefService::UNSYNCABLE_PREF);
 }
 
 ChromeToMobileService::ChromeToMobileService(Profile* profile)
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
@@ skipping 414 matching lines @@
 
       // Report failure below and ignore the second response.
       request_observer_map_.erase(other);
       break;
     }
   }
 
   if (observer.get())
     observer->OnSendComplete(success);
 }