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

Side by Side Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 2734113006: "Bootstrap" a toolkit-views Typography spec. (Closed)
Patch Set: ExtendableEnum Created 3 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 (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/views/website_settings/website_settings_popup_view.h " 5 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 ->IsOffTheRecord(); 577 ->IsOffTheRecord();
578 views::ImageView* icon = new NonAccessibleImageView(); 578 views::ImageView* icon = new NonAccessibleImageView();
579 const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(info); 579 const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(info);
580 icon->SetImage(image.ToImageSkia()); 580 icon->SetImage(image.ToImageSkia());
581 layout->AddView( 581 layout->AddView(
582 icon, 1, 2, views::GridLayout::FILL, 582 icon, 1, 2, views::GridLayout::FILL,
583 // TODO: The vertical alignment may change to CENTER once Harmony is 583 // TODO: The vertical alignment may change to CENTER once Harmony is
584 // implemented. See https://crbug.com/512442#c48 584 // implemented. See https://crbug.com/512442#c48
585 views::GridLayout::LEADING); 585 views::GridLayout::LEADING);
586 586
587 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
588 const gfx::FontList& font_list = rb.GetFontListWithDelta(1);
589 views::Label* cookies_label = new views::Label( 587 views::Label* cookies_label = new views::Label(
590 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TITLE_SITE_DATA), 588 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TITLE_SITE_DATA),
591 font_list); 589 views::TextContext::DIALOG_MESSAGE);
592 layout->AddView(cookies_label); 590 layout->AddView(cookies_label);
593 layout->StartRow(1, cookies_view_column); 591 layout->StartRow(1, cookies_view_column);
594 layout->SkipColumns(1); 592 layout->SkipColumns(1);
595 593
596 layout->AddView(cookie_dialog_link_); 594 layout->AddView(cookie_dialog_link_);
597 595
598 layout->AddPaddingRow(0, kCookiesViewVerticalPadding); 596 layout->AddPaddingRow(0, kCookiesViewVerticalPadding);
599 } 597 }
600 598
601 layout->Layout(cookies_view_); 599 layout->Layout(cookies_view_);
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED); 741 WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED);
744 break; 742 break;
745 case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS: 743 case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS:
746 presenter_->OnRevokeSSLErrorBypassButtonPressed(); 744 presenter_->OnRevokeSSLErrorBypassButtonPressed();
747 GetWidget()->Close(); 745 GetWidget()->Close();
748 break; 746 break;
749 default: 747 default:
750 NOTREACHED(); 748 NOTREACHED();
751 } 749 }
752 } 750 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698