Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3714)

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_handler.cc

Issue 20070002: Demo UI for device discovery and registration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added FILE_PATH_LITERAL macro to fix windows compile problem Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 32e601288e20518dbcf145f4bd293779e5da40bf..49a96b9949cc25db5e219a29460ce8da8aa5872d 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -46,6 +46,7 @@
#include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/cloud_print/cloud_print_constants.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/print_messages.h"
#include "content/public/browser/browser_context.h"
@@ -82,9 +83,6 @@ using printing::Metafile;
namespace {
-// The cloud print OAuth2 scope.
-const char kCloudPrintAuth[] = "https://www.googleapis.com/auth/cloudprint";
-
enum UserActionBuckets {
PRINT_TO_PRINTER,
PRINT_TO_PDF,
@@ -170,7 +168,6 @@ const char kPrintAutomaticallyInKioskMode[] = "printAutomaticallyInKioskMode";
// Name of a dictionary field holding the state of selection for document.
const char kDocumentHasSelection[] = "documentHasSelection";
-
// Get the print job settings dictionary from |args|. The caller takes
// ownership of the returned DictionaryValue. Returns NULL on failure.
DictionaryValue* GetSettingsDictionary(const ListValue* args) {
@@ -293,7 +290,7 @@ class PrintPreviewHandler::AccessTokenService
if (service) {
OAuth2TokenService::ScopeSet oauth_scopes;
- oauth_scopes.insert(kCloudPrintAuth);
+ oauth_scopes.insert(cloud_print::kCloudPrintAuth);
scoped_ptr<OAuth2TokenService::Request> request(
service->StartRequest(oauth_scopes, this));
requests_[type].reset(request.release());
@@ -1088,4 +1085,3 @@ bool PrintPreviewHandler::GetPreviewDataAndTitle(
*title = print_preview_ui->initiator_title();
return true;
}
-
« no previous file with comments | « chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698