Add Chrome To Mobile Service and Views Page Action.

chrome/service/cloud_print/cloud_print_proxy.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/service/cloud_print/cloud_print_proxy.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/cloud_print/cloud_print_helpers.h"
 #include "chrome/common/cloud_print/cloud_print_proxy_info.h"
 #include "chrome/common/net/gaia/gaia_oauth_client.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/print_system.h"
 #include "chrome/service/service_process.h"
 #include "chrome/service/service_process_prefs.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
@@ skipping 110 matching lines @@
   }
 }
 
 bool CloudPrintProxy::CreateBackend() {
   DCHECK(CalledOnValidThread());
   if (backend_.get())
     return false;
 
   service_prefs_->GetString(prefs::kCloudPrintProxyId, &proxy_id_);
   if (proxy_id_.empty()) {
-    proxy_id_ = cloud_print::PrintSystem::GenerateProxyId();
+    proxy_id_ = cloud_print::GenerateProxyId();
     service_prefs_->SetString(prefs::kCloudPrintProxyId, proxy_id_);
     service_prefs_->WritePrefs();
   }
 
   // Getting print system specific settings from the preferences.
   const DictionaryValue* print_system_settings = NULL;
   service_prefs_->GetDictionary(prefs::kCloudPrintPrintSystemSettings,
                                 &print_system_settings);
 
   // Check if there is an override for the cloud print server URL.
   std::string cloud_print_server_url_str;
   service_prefs_->GetString(prefs::kCloudPrintServiceURL,
                             &cloud_print_server_url_str);
-  if (cloud_print_server_url_str.empty()) {
+  if (cloud_print_server_url_str.empty())
     cloud_print_server_url_str = kDefaultCloudPrintServerUrl;
-  }
 
   // By default we don't poll for jobs when we lose XMPP connection. But this
   // behavior can be overridden by a preference.
   bool enable_job_poll = false;
   service_prefs_->GetBoolean(prefs::kCloudPrintEnableJobPoll,
                              &enable_job_poll);
 
   // TODO(sanjeevr): Allow overriding OAuthClientInfo in prefs.
   gaia::OAuthClientInfo oauth_client_info;
-  oauth_client_info.client_id = kDefaultCloudPrintOAuthClientId;
+  oauth_client_info.client_id = cloud_print::kDefaultCloudPrintOAuthClientId;
   oauth_client_info.client_secret = kDefaultCloudPrintOAuthClientSecret;
 
   GURL cloud_print_server_url(cloud_print_server_url_str.c_str());
   DCHECK(cloud_print_server_url.is_valid());
   backend_.reset(new CloudPrintProxyBackend(this, proxy_id_,
                                             cloud_print_server_url,
                                             print_system_settings,
                                             oauth_client_info,
                                             enable_job_poll));
   return true;
@@ skipping 70 matching lines @@
     client_->OnCloudPrintProxyDisabled(false);
   }
 }
 
 void CloudPrintProxy::Shutdown() {
   DCHECK(CalledOnValidThread());
   if (backend_.get())
     backend_->Shutdown();
   backend_.reset();
 }