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

Side by Side Diff: chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

Issue 1138603005: [Smart Lock] Update password generation confirmation to use new branding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android Created 5 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/passwords/manage_passwords_bubble_model.h" 5 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/password_manager/password_store_factory.h" 9 #include "chrome/browser/password_manager/password_store_factory.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/signin/signin_manager_factory.h" 11 #include "chrome/browser/signin/signin_manager_factory.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_finder.h" 13 #include "chrome/browser/ui/browser_finder.h"
14 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" 14 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
15 #include "chrome/browser/ui/passwords/password_bubble_experiment.h" 15 #include "chrome/browser/ui/passwords/password_bubble_experiment.h"
16 #include "chrome/common/url_constants.h"
16 #include "chrome/grit/chromium_strings.h" 17 #include "chrome/grit/chromium_strings.h"
17 #include "chrome/grit/generated_resources.h" 18 #include "chrome/grit/generated_resources.h"
18 #include "components/feedback/feedback_data.h" 19 #include "components/feedback/feedback_data.h"
19 #include "components/feedback/feedback_util.h" 20 #include "components/feedback/feedback_util.h"
20 #include "components/password_manager/core/browser/password_store.h" 21 #include "components/password_manager/core/browser/password_store.h"
21 #include "components/password_manager/core/common/credential_manager_types.h" 22 #include "components/password_manager/core/common/credential_manager_types.h"
22 #include "components/password_manager/core/common/password_manager_ui.h" 23 #include "components/password_manager/core/common/password_manager_ui.h"
23 #include "components/signin/core/browser/signin_manager.h" 24 #include "components/signin/core/browser/signin_manager.h"
24 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
25 #include "content/public/common/content_switches.h" 26 #include "content/public/common/content_switches.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 } else { 113 } else {
113 title_ = IsNewUIActive() ? 114 title_ = IsNewUIActive() ?
114 l10n_util::GetStringFUTF16(IDS_MANAGE_ACCOUNTS_TITLE, 115 l10n_util::GetStringFUTF16(IDS_MANAGE_ACCOUNTS_TITLE,
115 base::UTF8ToUTF16(origin_.spec())) : 116 base::UTF8ToUTF16(origin_.spec())) :
116 l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_TITLE); 117 l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_TITLE);
117 } 118 }
118 119
119 if (state_ == password_manager::ui::CONFIRMATION_STATE) { 120 if (state_ == password_manager::ui::CONFIRMATION_STATE) {
120 base::string16 save_confirmation_link = 121 base::string16 save_confirmation_link =
121 l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_LINK); 122 l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_LINK);
123 int confirmation_text_id = IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT;
124 if (password_bubble_experiment::IsSmartLockBrandingEnabled(GetProfile())) {
125 std::string management_hostname =
126 GURL(chrome::kPasswordManagerAccountDashboardURL).host();
127 save_confirmation_link = base::UTF8ToUTF16(management_hostname);
128 confirmation_text_id =
129 IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_SMART_LOCK_TEXT;
130 }
131
122 size_t offset; 132 size_t offset;
123 save_confirmation_text_ = 133 save_confirmation_text_ =
124 l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT, 134 l10n_util::GetStringFUTF16(
125 save_confirmation_link, &offset); 135 confirmation_text_id, save_confirmation_link, &offset);
126 save_confirmation_link_range_ = 136 save_confirmation_link_range_ =
127 gfx::Range(offset, offset + save_confirmation_link.length()); 137 gfx::Range(offset, offset + save_confirmation_link.length());
128 } 138 }
129 139
130 manage_link_ = 140 manage_link_ =
131 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK); 141 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
132 } 142 }
133 143
134 ManagePasswordsBubbleModel::~ManagePasswordsBubbleModel() {} 144 ManagePasswordsBubbleModel::~ManagePasswordsBubbleModel() {}
135 145
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 } 242 }
233 243
234 // TODO(gcasto): Is it worth having this be separate from OnDoneClicked()? 244 // TODO(gcasto): Is it worth having this be separate from OnDoneClicked()?
235 // User intent is pretty similar in both cases. 245 // User intent is pretty similar in both cases.
236 void ManagePasswordsBubbleModel::OnOKClicked() { 246 void ManagePasswordsBubbleModel::OnOKClicked() {
237 dismissal_reason_ = metrics_util::CLICKED_OK; 247 dismissal_reason_ = metrics_util::CLICKED_OK;
238 } 248 }
239 249
240 void ManagePasswordsBubbleModel::OnManageLinkClicked() { 250 void ManagePasswordsBubbleModel::OnManageLinkClicked() {
241 dismissal_reason_ = metrics_util::CLICKED_MANAGE; 251 dismissal_reason_ = metrics_util::CLICKED_MANAGE;
242 ManagePasswordsUIController::FromWebContents(web_contents()) 252 if (password_bubble_experiment::IsSmartLockBrandingEnabled(GetProfile())) {
243 ->NavigateToPasswordManagerSettingsPage(); 253 ManagePasswordsUIController::FromWebContents(web_contents())
254 ->NavigateToExternalPasswordManager();
255 } else {
256 ManagePasswordsUIController::FromWebContents(web_contents())
257 ->NavigateToPasswordManagerSettingsPage();
258 }
244 } 259 }
245 260
246 void ManagePasswordsBubbleModel::OnBrandLinkClicked() { 261 void ManagePasswordsBubbleModel::OnBrandLinkClicked() {
247 dismissal_reason_ = metrics_util::CLICKED_BRAND_NAME; 262 dismissal_reason_ = metrics_util::CLICKED_BRAND_NAME;
248 ManagePasswordsUIController::FromWebContents(web_contents()) 263 ManagePasswordsUIController::FromWebContents(web_contents())
249 ->NavigateToSmartLockHelpArticle(); 264 ->NavigateToSmartLockHelpArticle();
250 } 265 }
251 266
252 void ManagePasswordsBubbleModel::OnAutoSignInToastTimeout() { 267 void ManagePasswordsBubbleModel::OnAutoSignInToastTimeout() {
253 dismissal_reason_ = metrics_util::AUTO_SIGNIN_TOAST_TIMEOUT; 268 dismissal_reason_ = metrics_util::AUTO_SIGNIN_TOAST_TIMEOUT;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 int ManagePasswordsBubbleModel::PasswordFieldWidth() { 322 int ManagePasswordsBubbleModel::PasswordFieldWidth() {
308 return GetFieldWidth(PASSWORD_FIELD); 323 return GetFieldWidth(PASSWORD_FIELD);
309 } 324 }
310 325
311 void ManagePasswordsBubbleModel::UpdatePendingStateTitle() { 326 void ManagePasswordsBubbleModel::UpdatePendingStateTitle() {
312 title_brand_link_range_ = gfx::Range(); 327 title_brand_link_range_ = gfx::Range();
313 if (never_save_passwords_) { 328 if (never_save_passwords_) {
314 title_ = l10n_util::GetStringUTF16( 329 title_ = l10n_util::GetStringUTF16(
315 IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE); 330 IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE);
316 } else if (password_bubble_experiment::IsSmartLockBrandingEnabled( 331 } else if (password_bubble_experiment::IsSmartLockBrandingEnabled(
317 GetProfile())) { 332 GetProfile())) {
318 // "Google Smart Lock" should be a hyperlink. 333 // "Google Smart Lock" should be a hyperlink.
319 base::string16 brand_link = 334 base::string16 brand_link =
320 l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SMART_LOCK); 335 l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SMART_LOCK);
321 size_t offset = 0; 336 size_t offset = 0;
322 title_ = l10n_util::GetStringFUTF16(IDS_SAVE_PASSWORD, brand_link, &offset); 337 title_ = l10n_util::GetStringFUTF16(IDS_SAVE_PASSWORD, brand_link, &offset);
323 title_brand_link_range_ = gfx::Range(offset, offset + brand_link.length()); 338 title_brand_link_range_ = gfx::Range(offset, offset + brand_link.length());
324 } else { 339 } else {
325 base::string16 brand_link = 340 base::string16 brand_link =
326 l10n_util::GetStringUTF16(IDS_SAVE_PASSWORD_TITLE_BRAND); 341 l10n_util::GetStringUTF16(IDS_SAVE_PASSWORD_TITLE_BRAND);
327 title_ = l10n_util::GetStringFUTF16(IDS_SAVE_PASSWORD, brand_link); 342 title_ = l10n_util::GetStringFUTF16(IDS_SAVE_PASSWORD, brand_link);
328 } 343 }
329 } 344 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/passwords/manage_passwords_ui_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698