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

Side by Side Diff: chrome/browser/ui/sync/one_click_signin_helper.h

Issue 13896009: Remove landing page from history when redirecting to NTP so that the back-button will work as expec… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed test since required modules aren't available on all builds Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/sync/one_click_signin_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_ 5 #ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
6 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_ 6 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 static void InitializeFieldTrial(); 106 static void InitializeFieldTrial();
107 107
108 // Looks for the Google-Accounts-SignIn response header, and if found, 108 // Looks for the Google-Accounts-SignIn response header, and if found,
109 // tries to display an infobar in the tab contents identified by the 109 // tries to display an infobar in the tab contents identified by the
110 // child/route id. 110 // child/route id.
111 static void ShowInfoBarIfPossible(net::URLRequest* request, 111 static void ShowInfoBarIfPossible(net::URLRequest* request,
112 ProfileIOData* io_data, 112 ProfileIOData* io_data,
113 int child_id, 113 int child_id,
114 int route_id); 114 int route_id);
115 115
116 // Remove the item currently at the top of the history list. Due to
117 // limitations of the NavigationController, this cannot be done until
118 // a new page becomes "current".
119 static void RemoveCurrentHistoryItem(content::WebContents* web_contents);
120
116 private: 121 private:
117 explicit OneClickSigninHelper(content::WebContents* web_contents); 122 explicit OneClickSigninHelper(content::WebContents* web_contents);
118 friend class content::WebContentsUserData<OneClickSigninHelper>; 123 friend class content::WebContentsUserData<OneClickSigninHelper>;
119 friend class OneClickSigninHelperTest; 124 friend class OneClickSigninHelperTest;
120 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, 125 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
121 ShowInfoBarUIThreadIncognito); 126 ShowInfoBarUIThreadIncognito);
122 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, 127 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
123 SigninFromWebstoreWithConfigSyncfirst); 128 SigninFromWebstoreWithConfigSyncfirst);
124 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, 129 FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
125 ShowSigninBubbleAfterSigninComplete); 130 ShowSigninBubbleAfterSigninComplete);
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 239
235 // Whether a Gaia URL during the sign in process was not handled by the 240 // Whether a Gaia URL during the sign in process was not handled by the
236 // dedicated sign in process. This is set to false if at least one such 241 // dedicated sign in process. This is set to false if at least one such
237 // URL is detected. 242 // URL is detected.
238 bool is_trusted_; 243 bool is_trusted_;
239 244
240 DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelper); 245 DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelper);
241 }; 246 };
242 247
243 #endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_ 248 #endif // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/sync/one_click_signin_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698