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

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

Issue 530963002: Move IDS_LEARN_MORE to components_strings.grd (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build Created 6 years, 3 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
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 #include "chrome/browser/ui/sync/one_click_signin_helper.h" 5 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #include "content/public/browser/navigation_entry.h" 75 #include "content/public/browser/navigation_entry.h"
76 #include "content/public/browser/page_navigator.h" 76 #include "content/public/browser/page_navigator.h"
77 #include "content/public/browser/render_frame_host.h" 77 #include "content/public/browser/render_frame_host.h"
78 #include "content/public/browser/render_process_host.h" 78 #include "content/public/browser/render_process_host.h"
79 #include "content/public/browser/web_contents.h" 79 #include "content/public/browser/web_contents.h"
80 #include "content/public/browser/web_contents_delegate.h" 80 #include "content/public/browser/web_contents_delegate.h"
81 #include "content/public/common/frame_navigate_params.h" 81 #include "content/public/common/frame_navigate_params.h"
82 #include "content/public/common/page_transition_types.h" 82 #include "content/public/common/page_transition_types.h"
83 #include "google_apis/gaia/gaia_auth_util.h" 83 #include "google_apis/gaia/gaia_auth_util.h"
84 #include "google_apis/gaia/gaia_urls.h" 84 #include "google_apis/gaia/gaia_urls.h"
85 #include "grit/components_strings.h"
85 #include "ipc/ipc_message_macros.h" 86 #include "ipc/ipc_message_macros.h"
86 #include "net/base/url_util.h" 87 #include "net/base/url_util.h"
87 #include "net/cookies/cookie_monster.h" 88 #include "net/cookies/cookie_monster.h"
88 #include "net/url_request/url_request.h" 89 #include "net/url_request/url_request.h"
89 #include "ui/base/l10n/l10n_util.h" 90 #include "ui/base/l10n/l10n_util.h"
90 #include "url/gurl.h" 91 #include "url/gurl.h"
91 92
92 93
93 namespace { 94 namespace {
94 95
(...skipping 1501 matching lines...) Expand 10 before | Expand all | Expand 10 after
1596 // If the web contents is showing a blank page and not about to be closed, 1597 // If the web contents is showing a blank page and not about to be closed,
1597 // redirect to the NTP or apps page. 1598 // redirect to the NTP or apps page.
1598 if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) && 1599 if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) &&
1599 !signin::IsAutoCloseEnabledInURL(original_continue_url_)) { 1600 !signin::IsAutoCloseEnabledInURL(original_continue_url_)) {
1600 RedirectToNtpOrAppsPage( 1601 RedirectToNtpOrAppsPage(
1601 web_contents(), 1602 web_contents(),
1602 signin::GetSourceForPromoURL(original_continue_url_)); 1603 signin::GetSourceForPromoURL(original_continue_url_));
1603 } 1604 }
1604 } 1605 }
1605 } 1606 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698