| OLD | NEW |
| 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 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 ->IsOffTheRecord(); | 581 ->IsOffTheRecord(); |
| 582 views::ImageView* icon = new NonAccessibleImageView(); | 582 views::ImageView* icon = new NonAccessibleImageView(); |
| 583 const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(info); | 583 const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(info); |
| 584 icon->SetImage(image.ToImageSkia()); | 584 icon->SetImage(image.ToImageSkia()); |
| 585 layout->AddView( | 585 layout->AddView( |
| 586 icon, 1, 2, views::GridLayout::FILL, | 586 icon, 1, 2, views::GridLayout::FILL, |
| 587 // TODO: The vertical alignment may change to CENTER once Harmony is | 587 // TODO: The vertical alignment may change to CENTER once Harmony is |
| 588 // implemented. See https://crbug.com/512442#c48 | 588 // implemented. See https://crbug.com/512442#c48 |
| 589 views::GridLayout::LEADING); | 589 views::GridLayout::LEADING); |
| 590 | 590 |
| 591 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | |
| 592 const gfx::FontList& font_list = rb.GetFontListWithDelta(1); | |
| 593 views::Label* cookies_label = new views::Label( | 591 views::Label* cookies_label = new views::Label( |
| 594 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TITLE_SITE_DATA), | 592 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TITLE_SITE_DATA), |
| 595 font_list); | 593 views::TextContext::DIALOG_MESSAGE); |
| 596 layout->AddView(cookies_label); | 594 layout->AddView(cookies_label); |
| 597 layout->StartRow(1, cookies_view_column); | 595 layout->StartRow(1, cookies_view_column); |
| 598 layout->SkipColumns(1); | 596 layout->SkipColumns(1); |
| 599 | 597 |
| 600 layout->AddView(cookie_dialog_link_); | 598 layout->AddView(cookie_dialog_link_); |
| 601 | 599 |
| 602 layout->AddPaddingRow(0, kCookiesViewVerticalPadding); | 600 layout->AddPaddingRow(0, kCookiesViewVerticalPadding); |
| 603 } | 601 } |
| 604 | 602 |
| 605 layout->Layout(cookies_view_); | 603 layout->Layout(cookies_view_); |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 760 WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED); | 758 WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED); |
| 761 break; | 759 break; |
| 762 case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS: | 760 case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS: |
| 763 presenter_->OnRevokeSSLErrorBypassButtonPressed(); | 761 presenter_->OnRevokeSSLErrorBypassButtonPressed(); |
| 764 GetWidget()->Close(); | 762 GetWidget()->Close(); |
| 765 break; | 763 break; |
| 766 default: | 764 default: |
| 767 NOTREACHED(); | 765 NOTREACHED(); |
| 768 } | 766 } |
| 769 } | 767 } |
| OLD | NEW |