| Index: chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
|
| diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
|
| index be30edfbe1e0e39fe6941a728db1a3f93270818e..f532567f868ef2562dbbed7f76ba4989ea26b4ac 100644
|
| --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
|
| +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
|
| @@ -14,6 +14,7 @@
|
| #include "chrome/browser/notifications/notification.h"
|
| #include "chrome/browser/notifications/notification_ui_manager.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| +#include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/service/service_process_control.h"
|
| #include "chrome/browser/service/service_process_control_manager.h"
|
| @@ -120,7 +121,9 @@ void CloudPrintProxyService::OnTokenExpiredNotificationClick() {
|
| // Clear the cached cloud print email pref so that the cloud print setup
|
| // flow happens.
|
| profile_->GetPrefs()->SetString(prefs::kCloudPrintEmail, std::string());
|
| - CloudPrintSetupFlow::OpenDialog(profile_, this, NULL);
|
| + cloud_print_setup_handler_.reset(new CloudPrintSetupHandler(this));
|
| + CloudPrintSetupFlow::OpenDialog(
|
| + profile_, cloud_print_setup_handler_->AsWeakPtr(), NULL);
|
| }
|
|
|
| void CloudPrintProxyService::TokenExpiredNotificationDone(bool keep_alive) {
|
| @@ -133,7 +136,7 @@ void CloudPrintProxyService::TokenExpiredNotificationDone(bool keep_alive) {
|
| }
|
| }
|
|
|
| -void CloudPrintProxyService::OnDialogClosed() {
|
| +void CloudPrintProxyService::OnCloudPrintSetupClosed() {
|
| MessageLoop::current()->PostTask(
|
| FROM_HERE, NewRunnableFunction(&BrowserList::EndKeepAlive));
|
| }
|
|
|