OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/options/advanced_contents_view.h" | 5 #include "chrome/browser/ui/views/options/advanced_contents_view.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 | 8 |
9 #include <cryptuiapi.h> | 9 #include <cryptuiapi.h> |
10 #pragma comment(lib, "cryptui.lib") | 10 #pragma comment(lib, "cryptui.lib") |
(...skipping 30 matching lines...) Expand all Loading... |
41 #include "chrome/browser/ui/options/options_util.h" | 41 #include "chrome/browser/ui/options/options_util.h" |
42 #include "chrome/browser/ui/options/show_options_url.h" | 42 #include "chrome/browser/ui/options/show_options_url.h" |
43 #include "chrome/browser/ui/views/browser_dialogs.h" | 43 #include "chrome/browser/ui/views/browser_dialogs.h" |
44 #include "chrome/browser/ui/views/clear_browsing_data.h" | 44 #include "chrome/browser/ui/views/clear_browsing_data.h" |
45 #include "chrome/browser/ui/views/list_background.h" | 45 #include "chrome/browser/ui/views/list_background.h" |
46 #include "chrome/browser/ui/views/options/content_settings_window_view.h" | 46 #include "chrome/browser/ui/views/options/content_settings_window_view.h" |
47 #include "chrome/browser/ui/views/options/fonts_languages_window_view.h" | 47 #include "chrome/browser/ui/views/options/fonts_languages_window_view.h" |
48 #include "chrome/common/chrome_switches.h" | 48 #include "chrome/common/chrome_switches.h" |
49 #include "chrome/common/pref_names.h" | 49 #include "chrome/common/pref_names.h" |
50 #include "chrome/common/url_constants.h" | 50 #include "chrome/common/url_constants.h" |
51 #include "gfx/canvas_skia.h" | |
52 #include "gfx/native_theme_win.h" | |
53 #include "grit/app_resources.h" | 51 #include "grit/app_resources.h" |
54 #include "grit/chromium_strings.h" | 52 #include "grit/chromium_strings.h" |
55 #include "grit/generated_resources.h" | 53 #include "grit/generated_resources.h" |
56 #include "grit/locale_settings.h" | 54 #include "grit/locale_settings.h" |
57 #include "net/base/ssl_config_service_win.h" | 55 #include "net/base/ssl_config_service_win.h" |
58 #include "skia/ext/skia_utils_win.h" | 56 #include "skia/ext/skia_utils_win.h" |
59 #include "third_party/skia/include/core/SkBitmap.h" | 57 #include "third_party/skia/include/core/SkBitmap.h" |
60 #include "ui/base/l10n/l10n_util.h" | 58 #include "ui/base/l10n/l10n_util.h" |
61 #include "ui/base/resource/resource_bundle.h" | 59 #include "ui/base/resource/resource_bundle.h" |
| 60 #include "ui/gfx/canvas_skia.h" |
| 61 #include "ui/gfx/native_theme_win.h" |
62 #include "views/background.h" | 62 #include "views/background.h" |
63 #include "views/controls/button/checkbox.h" | 63 #include "views/controls/button/checkbox.h" |
64 #include "views/controls/combobox/combobox.h" | 64 #include "views/controls/combobox/combobox.h" |
65 #include "views/controls/scroll_view.h" | 65 #include "views/controls/scroll_view.h" |
66 #include "views/controls/textfield/textfield.h" | 66 #include "views/controls/textfield/textfield.h" |
67 #include "views/layout/grid_layout.h" | 67 #include "views/layout/grid_layout.h" |
68 #include "views/layout/layout_constants.h" | 68 #include "views/layout/layout_constants.h" |
69 #include "views/widget/widget.h" | 69 #include "views/widget/widget.h" |
70 #include "views/window/window.h" | 70 #include "views/window/window.h" |
71 | 71 |
(...skipping 1575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1647 // AdvancedScrollViewContainer, views::View overrides: | 1647 // AdvancedScrollViewContainer, views::View overrides: |
1648 | 1648 |
1649 void AdvancedScrollViewContainer::Layout() { | 1649 void AdvancedScrollViewContainer::Layout() { |
1650 gfx::Rect lb = GetLocalBounds(false); | 1650 gfx::Rect lb = GetLocalBounds(false); |
1651 | 1651 |
1652 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( | 1652 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( |
1653 gfx::NativeTheme::LIST); | 1653 gfx::NativeTheme::LIST); |
1654 lb.Inset(border.width(), border.height()); | 1654 lb.Inset(border.width(), border.height()); |
1655 scroll_view_->SetBounds(lb); | 1655 scroll_view_->SetBounds(lb); |
1656 } | 1656 } |
OLD | NEW |