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

Side by Side Diff: chrome/browser/ui/views/passwords/account_chooser_dialog_view.cc

Issue 1723583004: CREDENTIAL: Convert federations from URLs to origins throughout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iOS2 Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/views/passwords/account_chooser_dialog_view.h" 5 #include "chrome/browser/ui/views/passwords/account_chooser_dialog_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/passwords/password_dialog_controller.h" 9 #include "chrome/browser/ui/passwords/password_dialog_controller.h"
10 #include "chrome/browser/ui/views/passwords/credentials_item_view.h" 10 #include "chrome/browser/ui/views/passwords/credentials_item_view.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 layout->AddPaddingRow(0, 2*views::kRelatedControlVerticalSpacing); 152 layout->AddPaddingRow(0, 2*views::kRelatedControlVerticalSpacing);
153 153
154 // Show credentials. 154 // Show credentials.
155 net::URLRequestContextGetter* request_context = 155 net::URLRequestContextGetter* request_context =
156 GetProfileFromWebContents(web_contents_)->GetRequestContext(); 156 GetProfileFromWebContents(web_contents_)->GetRequestContext();
157 BuildColumnSet(SINGLE_VIEW_COLUMN_SET_NO_PADDING, layout); 157 BuildColumnSet(SINGLE_VIEW_COLUMN_SET_NO_PADDING, layout);
158 for (const auto& form : controller_->GetLocalForms()) { 158 for (const auto& form : controller_->GetLocalForms()) {
159 const base::string16& upper_string = 159 const base::string16& upper_string =
160 form->display_name.empty() ? form->username_value : form->display_name; 160 form->display_name.empty() ? form->username_value : form->display_name;
161 base::string16 lower_string; 161 base::string16 lower_string;
162 if (form->federation_url.is_empty()) { 162 if (form->federation_origin.unique()) {
163 if (!form->display_name.empty()) 163 if (!form->display_name.empty())
164 lower_string = form->username_value; 164 lower_string = form->username_value;
165 } else { 165 } else {
166 lower_string = l10n_util::GetStringFUTF16( 166 lower_string = l10n_util::GetStringFUTF16(
167 IDS_PASSWORDS_VIA_FEDERATION, 167 IDS_PASSWORDS_VIA_FEDERATION,
168 base::UTF8ToUTF16(form->federation_url.host())); 168 base::UTF8ToUTF16(form->federation_origin.host()));
169 } 169 }
170 layout->StartRow(0, SINGLE_VIEW_COLUMN_SET_NO_PADDING); 170 layout->StartRow(0, SINGLE_VIEW_COLUMN_SET_NO_PADDING);
171 CredentialsItemView* view = new CredentialsItemView( 171 CredentialsItemView* view = new CredentialsItemView(
172 this, upper_string, lower_string, kButtonHoverColor, 172 this, upper_string, lower_string, kButtonHoverColor,
173 form.get(), request_context); 173 form.get(), request_context);
174 view->SetLowerLabelColor(kAutoSigninTextColor); 174 view->SetLowerLabelColor(kAutoSigninTextColor);
175 view->SetBorder(views::Border::CreateEmptyBorder( 175 view->SetBorder(views::Border::CreateEmptyBorder(
176 kVerticalAvatarMargin, views::kButtonHEdgeMarginNew, 176 kVerticalAvatarMargin, views::kButtonHEdgeMarginNew,
177 kVerticalAvatarMargin, views::kButtonHEdgeMarginNew)); 177 kVerticalAvatarMargin, views::kButtonHEdgeMarginNew));
178 layout->AddView(view); 178 layout->AddView(view);
179 } 179 }
180 // DialogClientView adds kRelatedControlVerticalSpacing padding once more for 180 // DialogClientView adds kRelatedControlVerticalSpacing padding once more for
181 // the buttons. 181 // the buttons.
182 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); 182 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
183 } 183 }
184 184
185 AccountChooserPrompt* CreateAccountChooserPromptView( 185 AccountChooserPrompt* CreateAccountChooserPromptView(
186 PasswordDialogController* controller, content::WebContents* web_contents) { 186 PasswordDialogController* controller, content::WebContents* web_contents) {
187 return new AccountChooserDialogView(controller, web_contents); 187 return new AccountChooserDialogView(controller, web_contents);
188 } 188 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698