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

Unified Diff: chrome/browser/printing/cloud_print/cloud_print_setup_flow.h

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
Index: chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
index 11dcdf2c004d068f61841ed368d432716d9dee62..3e1adac1804f49bb9ca4b74717e268a2c886d74e 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/time.h"
+#include "base/weak_ptr.h"
#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
#include "chrome/common/net/gaia/gaia_auth_fetcher.h"
@@ -53,8 +54,10 @@ class CloudPrintSetupFlow : public HtmlDialogUIDelegate,
// Runs a flow from |start| to |end|, and does the work of actually showing
// the HTML dialog. |container| is kept up-to-date with the lifetime of the
// flow (e.g it is emptied on dialog close).
- static CloudPrintSetupFlow* OpenDialog(Profile* service, Delegate* delegate,
- gfx::NativeWindow parent_window);
+ static CloudPrintSetupFlow* OpenDialog(
+ Profile* service,
+ const base::WeakPtr<Delegate>& delegate,
+ gfx::NativeWindow parent_window);
// Focuses the dialog. This is useful in cases where the dialog has been
// obscured by a browser window.
@@ -84,7 +87,7 @@ class CloudPrintSetupFlow : public HtmlDialogUIDelegate,
// Use static Run method to get an instance.
CloudPrintSetupFlow(const std::string& args, Profile* profile,
- Delegate* delegate, bool setup_done);
+ const base::WeakPtr<Delegate>& delegate, bool setup_done);
// Called CloudPrintSetupMessageHandler when a DOM is attached. This method
// is called when the HTML page is fully loaded. We then operate on this
@@ -128,7 +131,7 @@ class CloudPrintSetupFlow : public HtmlDialogUIDelegate,
// Handle to the ServiceProcessControl which talks to the service process.
ServiceProcessControl* process_control_;
- Delegate* delegate_;
+ base::WeakPtr<Delegate> delegate_;
DISALLOW_COPY_AND_ASSIGN(CloudPrintSetupFlow);
};

Powered by Google App Engine
This is Rietveld 408576698