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

Side by Side Diff: chrome/browser/ui/views/certificate_selector.cc

Issue 1958453002: Update some secondary UI buttons to MD style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: const qualifier Created 4 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 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/certificate_selector.h" 5 #include "chrome/browser/ui/views/certificate_selector.h"
6 6
7 #include <stddef.h> // For size_t. 7 #include <stddef.h> // For size_t.
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "chrome/browser/certificate_viewer.h" 17 #include "chrome/browser/certificate_viewer.h"
18 #include "chrome/grit/generated_resources.h" 18 #include "chrome/grit/generated_resources.h"
19 #include "components/constrained_window/constrained_window_views.h" 19 #include "components/constrained_window/constrained_window_views.h"
20 #include "components/guest_view/browser/guest_view_base.h" 20 #include "components/guest_view/browser/guest_view_base.h"
21 #include "components/web_modal/web_contents_modal_dialog_manager.h" 21 #include "components/web_modal/web_contents_modal_dialog_manager.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "grit/components_strings.h" 23 #include "grit/components_strings.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/models/table_model.h" 25 #include "ui/base/models/table_model.h"
26 #include "ui/base/models/table_model_observer.h" 26 #include "ui/base/models/table_model_observer.h"
27 #include "ui/views/controls/button/label_button.h" 27 #include "ui/views/controls/button/label_button.h"
msw 2016/05/12 19:17:04 nit: remove
Evan Stade 2016/05/12 19:32:01 Done.
28 #include "ui/views/controls/button/md_text_button.h"
28 #include "ui/views/controls/table/table_view.h" 29 #include "ui/views/controls/table/table_view.h"
29 #include "ui/views/layout/grid_layout.h" 30 #include "ui/views/layout/grid_layout.h"
30 #include "ui/views/layout/layout_constants.h" 31 #include "ui/views/layout/layout_constants.h"
31 #include "ui/views/widget/widget.h" 32 #include "ui/views/widget/widget.h"
32 #include "ui/views/window/dialog_client_view.h" 33 #include "ui/views/window/dialog_client_view.h"
33 34
34 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
35 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv ice.h" 36 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv ice.h"
36 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv ice_factory.h" 37 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv ice_factory.h"
37 #include "extensions/browser/extension_registry.h" 38 #include "extensions/browser/extension_registry.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 return button != ui::DIALOG_BUTTON_OK || GetSelectedCert() != nullptr; 245 return button != ui::DIALOG_BUTTON_OK || GetSelectedCert() != nullptr;
245 } 246 }
246 247
247 views::View* CertificateSelector::GetInitiallyFocusedView() { 248 views::View* CertificateSelector::GetInitiallyFocusedView() {
248 DCHECK(table_); 249 DCHECK(table_);
249 return table_; 250 return table_;
250 } 251 }
251 252
252 views::View* CertificateSelector::CreateExtraView() { 253 views::View* CertificateSelector::CreateExtraView() {
253 DCHECK(!view_cert_button_); 254 DCHECK(!view_cert_button_);
254 std::unique_ptr<views::LabelButton> button(new views::LabelButton( 255 view_cert_button_ = views::MdTextButton::CreateSecondaryUiButton(
255 this, l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON))); 256 this, l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON));
256 button->SetStyle(views::Button::STYLE_BUTTON); 257 return view_cert_button_;
257 view_cert_button_ = button.get();
258 return button.release();
259 } 258 }
260 259
261 ui::ModalType CertificateSelector::GetModalType() const { 260 ui::ModalType CertificateSelector::GetModalType() const {
262 return ui::MODAL_TYPE_CHILD; 261 return ui::MODAL_TYPE_CHILD;
263 } 262 }
264 263
265 void CertificateSelector::ButtonPressed(views::Button* sender, 264 void CertificateSelector::ButtonPressed(views::Button* sender,
266 const ui::Event& event) { 265 const ui::Event& event) {
267 if (sender == view_cert_button_) { 266 if (sender == view_cert_button_) {
268 net::X509Certificate* const cert = GetSelectedCert(); 267 net::X509Certificate* const cert = GetSelectedCert();
269 if (cert) 268 if (cert)
270 ShowCertificateViewer(web_contents_, 269 ShowCertificateViewer(web_contents_,
271 web_contents_->GetTopLevelNativeWindow(), cert); 270 web_contents_->GetTopLevelNativeWindow(), cert);
272 } 271 }
273 } 272 }
274 273
275 void CertificateSelector::OnSelectionChanged() { 274 void CertificateSelector::OnSelectionChanged() {
276 GetDialogClientView()->ok_button()->SetEnabled(GetSelectedCert() != nullptr); 275 GetDialogClientView()->ok_button()->SetEnabled(GetSelectedCert() != nullptr);
277 } 276 }
278 277
279 void CertificateSelector::OnDoubleClick() { 278 void CertificateSelector::OnDoubleClick() {
280 if (GetSelectedCert()) 279 if (GetSelectedCert())
281 GetDialogClientView()->AcceptWindow(); 280 GetDialogClientView()->AcceptWindow();
282 } 281 }
283 282
284 } // namespace chrome 283 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698