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

Unified Diff: trunk/src/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

Issue 416543006: Revert 284958 "Make HistoryDBTask not refcounted, and ensure it'..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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: trunk/src/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
===================================================================
--- trunk/src/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc (revision 285001)
+++ trunk/src/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc (working copy)
@@ -38,7 +38,8 @@
namespace {
-class InlineSigninHelper : public SigninOAuthHelper::Consumer {
+class InlineSigninHelper : public SigninOAuthHelper,
+ public SigninOAuthHelper::Consumer {
public:
InlineSigninHelper(
base::WeakPtr<InlineLoginHandlerImpl> handler,
@@ -60,7 +61,6 @@
virtual void OnSigninOAuthInformationFailure(
const GoogleServiceAuthError& error) OVERRIDE;
- SigninOAuthHelper signin_oauth_helper_;
base::WeakPtr<InlineLoginHandlerImpl> handler_;
Profile* profile_;
GURL current_url_;
@@ -82,8 +82,7 @@
const std::string& session_index,
const std::string& signin_scoped_device_id,
bool choose_what_to_sync)
- : signin_oauth_helper_(getter, session_index, signin_scoped_device_id,
- this),
+ : SigninOAuthHelper(getter, session_index, signin_scoped_device_id, this),
handler_(handler),
profile_(profile),
current_url_(current_url),
« no previous file with comments | « trunk/src/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc ('k') | trunk/src/chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698