| 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 <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "components/content_settings/core/common/content_settings_types.h" | 23 #include "components/content_settings/core/common/content_settings_types.h" |
| 24 #include "content/public/browser/browser_thread.h" | 24 #include "content/public/browser/browser_thread.h" |
| 25 #include "content/public/browser/cert_store.h" | 25 #include "content/public/browser/cert_store.h" |
| 26 #include "content/public/browser/user_metrics.h" | 26 #include "content/public/browser/user_metrics.h" |
| 27 #include "grit/theme_resources.h" | 27 #include "grit/theme_resources.h" |
| 28 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" |
| 29 #include "ui/base/models/simple_menu_model.h" | 29 #include "ui/base/models/simple_menu_model.h" |
| 30 #include "ui/base/resource/resource_bundle.h" | 30 #include "ui/base/resource/resource_bundle.h" |
| 31 #include "ui/gfx/canvas.h" | 31 #include "ui/gfx/canvas.h" |
| 32 #include "ui/gfx/font_list.h" | 32 #include "ui/gfx/font_list.h" |
| 33 #include "ui/gfx/geometry/insets.h" |
| 33 #include "ui/gfx/image/image.h" | 34 #include "ui/gfx/image/image.h" |
| 34 #include "ui/gfx/insets.h" | |
| 35 #include "ui/resources/grit/ui_resources.h" | 35 #include "ui/resources/grit/ui_resources.h" |
| 36 #include "ui/views/controls/button/image_button.h" | 36 #include "ui/views/controls/button/image_button.h" |
| 37 #include "ui/views/controls/button/menu_button.h" | 37 #include "ui/views/controls/button/menu_button.h" |
| 38 #include "ui/views/controls/button/menu_button_listener.h" | 38 #include "ui/views/controls/button/menu_button_listener.h" |
| 39 #include "ui/views/controls/image_view.h" | 39 #include "ui/views/controls/image_view.h" |
| 40 #include "ui/views/controls/label.h" | 40 #include "ui/views/controls/label.h" |
| 41 #include "ui/views/controls/link.h" | 41 #include "ui/views/controls/link.h" |
| 42 #include "ui/views/controls/menu/menu_model_adapter.h" | 42 #include "ui/views/controls/menu/menu_model_adapter.h" |
| 43 #include "ui/views/controls/menu/menu_runner.h" | 43 #include "ui/views/controls/menu/menu_runner.h" |
| 44 #include "ui/views/controls/separator.h" | 44 #include "ui/views/controls/separator.h" |
| (...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 | 831 |
| 832 if (reset_decisions_button) { | 832 if (reset_decisions_button) { |
| 833 content_layout->StartRow(1, 0); | 833 content_layout->StartRow(1, 0); |
| 834 content_layout->AddView(reset_decisions_button); | 834 content_layout->AddView(reset_decisions_button); |
| 835 } | 835 } |
| 836 | 836 |
| 837 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, | 837 layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING, |
| 838 views::GridLayout::LEADING); | 838 views::GridLayout::LEADING); |
| 839 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); | 839 layout->AddPaddingRow(0, kConnectionSectionPaddingBottom); |
| 840 } | 840 } |
| OLD | NEW |