diff options
author | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-04 16:37:34 +0000 |
---|---|---|
committer | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-04 16:37:34 +0000 |
commit | 8c885f66a6a432a182ddb1e09bd10ed6aeb4c178 (patch) | |
tree | 3129651d957439b6961a08b60573907d4e4e57c1 /chrome/browser/ui/webui | |
parent | 7cefa6bf1eae4bce7b5e28f94f595661415c89f9 (diff) | |
download | chromium_src-8c885f66a6a432a182ddb1e09bd10ed6aeb4c178.zip chromium_src-8c885f66a6a432a182ddb1e09bd10ed6aeb4c178.tar.gz chromium_src-8c885f66a6a432a182ddb1e09bd10ed6aeb4c178.tar.bz2 |
Add mirror support to cloud print.
BUG=388826
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/349343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
-rw-r--r-- | chrome/browser/ui/webui/print_preview/print_preview_handler.cc | 29 | ||||
-rw-r--r-- | chrome/browser/ui/webui/print_preview/print_preview_handler.h | 19 |
2 files changed, 46 insertions, 2 deletions
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 f47fe27..ffc06bd 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -36,6 +36,7 @@ #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/printing/printer_manager_dialog.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/signin/account_reconcilor_factory.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/browser_finder.h" @@ -54,9 +55,10 @@ #include "components/cloud_devices/common/cloud_device_description.h" #include "components/cloud_devices/common/cloud_devices_urls.h" #include "components/cloud_devices/common/printer_description.h" +#include "components/signin/core/browser/account_reconcilor.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" -#include "components/signin/core/browser/signin_manager_base.h" +#include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" @@ -551,6 +553,7 @@ PrintPreviewHandler::PrintPreviewHandler() manage_cloud_printers_dialog_request_count_(0), reported_failed_preview_(false), has_logged_printers_count_(false), + reconcilor_(NULL), weak_factory_(this) { ReportUserActionHistogram(PREVIEW_STARTED); } @@ -558,6 +561,8 @@ PrintPreviewHandler::PrintPreviewHandler() PrintPreviewHandler::~PrintPreviewHandler() { if (select_file_dialog_.get()) select_file_dialog_->ListenerDestroyed(); + + UnregisterForMergeSession(); } void PrintPreviewHandler::RegisterMessages() { @@ -621,6 +626,7 @@ void PrintPreviewHandler::RegisterMessages() { web_ui()->RegisterMessageCallback("getPrivetPrinterCapabilities", base::Bind(&PrintPreviewHandler::HandleGetPrivetPrinterCapabilities, base::Unretained(this))); + RegisterForMergeSession(); } bool PrintPreviewHandler::PrivetPrintingEnabled() { @@ -1267,6 +1273,12 @@ void PrintPreviewHandler::OnPrintDialogShown() { ClosePreviewDialog(); } +void PrintPreviewHandler::MergeSessionCompleted( + const std::string& account_id, + const GoogleServiceAuthError& error) { + OnSigninComplete(); +} + void PrintPreviewHandler::SelectFile(const base::FilePath& default_filename) { ui::SelectFileDialog::FileTypeInfo file_type_info; file_type_info.extensions.resize(1); @@ -1587,3 +1599,18 @@ void PrintPreviewHandler::FillPrinterDescription( } #endif // defined(ENABLE_SERVICE_DISCOVERY) + +void PrintPreviewHandler::RegisterForMergeSession() { + DCHECK(!reconcilor_); + Profile* profile = Profile::FromWebUI(web_ui()); + if (switches::IsEnableAccountConsistency() && !profile->IsOffTheRecord()) { + reconcilor_ = AccountReconcilorFactory::GetForProfile(profile); + if (reconcilor_) + reconcilor_->AddMergeSessionObserver(this); + } +} + +void PrintPreviewHandler::UnregisterForMergeSession() { + if (reconcilor_) + reconcilor_->RemoveMergeSessionObserver(this); +} diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.h b/chrome/browser/ui/webui/print_preview/print_preview_handler.h index 3f4a48a..efc5720 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.h @@ -13,6 +13,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/printing/print_view_manager_observer.h" #include "content/public/browser/web_ui_message_handler.h" +#include "google_apis/gaia/merge_session_helper.h" #include "ui/shell_dialogs/select_file_dialog.h" #if defined(ENABLE_SERVICE_DISCOVERY) @@ -20,6 +21,7 @@ #include "chrome/browser/local_discovery/service_discovery_shared_client.h" #endif // ENABLE_SERVICE_DISCOVERY +class AccountReconcilor; class PrintSystemTaskProxy; namespace base { @@ -43,7 +45,8 @@ class PrintPreviewHandler public local_discovery::PrivetLocalPrintOperation::Delegate, #endif public ui::SelectFileDialog::Listener, - public printing::PrintViewManagerObserver { + public printing::PrintViewManagerObserver, + public MergeSessionHelper::Observer { public: PrintPreviewHandler(); virtual ~PrintPreviewHandler(); @@ -60,6 +63,11 @@ class PrintPreviewHandler // PrintViewManagerObserver implementation. virtual void OnPrintDialogShown() OVERRIDE; + // MergeSessionHelper::Observer implementation. + virtual void MergeSessionCompleted( + const std::string& account_id, + const GoogleServiceAuthError& error) OVERRIDE; + // Displays a modal dialog, prompting the user to select a file. void SelectFile(const base::FilePath& default_path); @@ -271,6 +279,11 @@ class PrintPreviewHandler base::DictionaryValue* printer_value); #endif + // Register/unregister from notifications of changes done to the GAIA + // cookie. + void RegisterForMergeSession(); + void UnregisterForMergeSession(); + // The underlying dialog object. scoped_refptr<ui::SelectFileDialog> select_file_dialog_; @@ -295,6 +308,10 @@ class PrintPreviewHandler // Holds token service to get OAuth2 access tokens. scoped_ptr<AccessTokenService> token_service_; + // Pointer to reconcilor so that print preview can listen for GAIA cookie + // changes. + AccountReconcilor* reconcilor_; + #if defined(ENABLE_SERVICE_DISCOVERY) scoped_refptr<local_discovery::ServiceDiscoverySharedClient> service_discovery_client_; |