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

Unified Diff: chrome/browser/ui/webui/options/advanced_options_handler.cc

Issue 6685008: Cloud print signin crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase past Windows views options removal. Created 9 years, 9 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
« no previous file with comments | « chrome/browser/ui/webui/options/advanced_options_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/advanced_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc
index f5cd5223abe146a1177df564fd04a0586de1222c..c0c36cfc6fc3c21fb42782f95ce00ca8714334b0 100644
--- a/chrome/browser/ui/webui/options/advanced_options_handler.cc
+++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc
@@ -41,6 +41,7 @@
#if !defined(OS_CHROMEOS)
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
#include "chrome/browser/ui/webui/options/advanced_options_utils.h"
#endif
@@ -358,7 +359,7 @@ void AdvancedOptionsHandler::FileSelected(const FilePath& path, int index,
SetupDownloadLocationPath();
}
-void AdvancedOptionsHandler::OnDialogClosed() {
+void AdvancedOptionsHandler::OnCloudPrintSetupClosed() {
#if !defined(OS_CHROMEOS)
if (cloud_print_proxy_ui_enabled_)
SetupCloudPrintProxySection();
@@ -446,8 +447,9 @@ void AdvancedOptionsHandler::ShowManageSSLCertificates(const ListValue* args) {
#if !defined(OS_CHROMEOS)
void AdvancedOptionsHandler::ShowCloudPrintSetupDialog(const ListValue* args) {
UserMetricsRecordAction(UserMetricsAction("Options_EnableCloudPrintProxy"));
+ cloud_print_setup_handler_.reset(new CloudPrintSetupHandler(this));
CloudPrintSetupFlow::OpenDialog(
- web_ui_->GetProfile(), this,
+ web_ui_->GetProfile(), cloud_print_setup_handler_->AsWeakPtr(),
web_ui_->tab_contents()->GetMessageBoxRootWindow());
}
« no previous file with comments | « chrome/browser/ui/webui/options/advanced_options_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698