OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/options/advanced_contents_view.h" | 5 #include "chrome/browser/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 10 matching lines...) Expand all Loading... |
21 #include "base/path_service.h" | 21 #include "base/path_service.h" |
22 #include "base/scoped_callback_factory.h" | 22 #include "base/scoped_callback_factory.h" |
23 #include "base/thread.h" | 23 #include "base/thread.h" |
24 #include "base/utf_string_conversions.h" | 24 #include "base/utf_string_conversions.h" |
25 #include "chrome/browser/browser_list.h" | 25 #include "chrome/browser/browser_list.h" |
26 #include "chrome/browser/browser_process.h" | 26 #include "chrome/browser/browser_process.h" |
27 #include "chrome/browser/download/download_manager.h" | 27 #include "chrome/browser/download/download_manager.h" |
28 #include "chrome/browser/download/download_prefs.h" | 28 #include "chrome/browser/download/download_prefs.h" |
29 #include "chrome/browser/google/google_util.h" | 29 #include "chrome/browser/google/google_util.h" |
30 #include "chrome/browser/gears_integration.h" | 30 #include "chrome/browser/gears_integration.h" |
31 #include "chrome/browser/options_util.h" | |
32 #include "chrome/browser/prefs/pref_member.h" | 31 #include "chrome/browser/prefs/pref_member.h" |
33 #include "chrome/browser/prefs/pref_service.h" | 32 #include "chrome/browser/prefs/pref_service.h" |
34 #include "chrome/browser/prefs/pref_set_observer.h" | 33 #include "chrome/browser/prefs/pref_set_observer.h" |
35 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 34 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
36 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" | 35 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" |
37 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" | 36 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" |
38 #include "chrome/browser/profile.h" | 37 #include "chrome/browser/profile.h" |
39 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" | 38 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
40 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 39 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
41 #include "chrome/browser/shell_dialogs.h" | 40 #include "chrome/browser/shell_dialogs.h" |
42 #include "chrome/browser/show_options_url.h" | |
43 #include "chrome/browser/ui/browser.h" | 41 #include "chrome/browser/ui/browser.h" |
44 #include "chrome/browser/views/browser_dialogs.h" | 42 #include "chrome/browser/ui/options/options_util.h" |
45 #include "chrome/browser/views/clear_browsing_data.h" | 43 #include "chrome/browser/ui/options/show_options_url.h" |
46 #include "chrome/browser/views/list_background.h" | 44 #include "chrome/browser/ui/views/browser_dialogs.h" |
47 #include "chrome/browser/views/options/content_settings_window_view.h" | 45 #include "chrome/browser/ui/views/clear_browsing_data.h" |
48 #include "chrome/browser/views/options/fonts_languages_window_view.h" | 46 #include "chrome/browser/ui/views/list_background.h" |
49 #include "chrome/browser/views/restart_message_box.h" | 47 #include "chrome/browser/ui/views/options/content_settings_window_view.h" |
| 48 #include "chrome/browser/ui/views/options/fonts_languages_window_view.h" |
| 49 #include "chrome/browser/ui/views/restart_message_box.h" |
50 #include "chrome/common/chrome_switches.h" | 50 #include "chrome/common/chrome_switches.h" |
51 #include "chrome/common/pref_names.h" | 51 #include "chrome/common/pref_names.h" |
52 #include "chrome/common/url_constants.h" | 52 #include "chrome/common/url_constants.h" |
53 #include "gfx/canvas_skia.h" | 53 #include "gfx/canvas_skia.h" |
54 #include "gfx/native_theme_win.h" | 54 #include "gfx/native_theme_win.h" |
55 #include "grit/app_resources.h" | 55 #include "grit/app_resources.h" |
56 #include "grit/chromium_strings.h" | 56 #include "grit/chromium_strings.h" |
57 #include "grit/generated_resources.h" | 57 #include "grit/generated_resources.h" |
58 #include "grit/locale_settings.h" | 58 #include "grit/locale_settings.h" |
59 #include "net/base/ssl_config_service_win.h" | 59 #include "net/base/ssl_config_service_win.h" |
(...skipping 1559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1619 // AdvancedScrollViewContainer, views::View overrides: | 1619 // AdvancedScrollViewContainer, views::View overrides: |
1620 | 1620 |
1621 void AdvancedScrollViewContainer::Layout() { | 1621 void AdvancedScrollViewContainer::Layout() { |
1622 gfx::Rect lb = GetLocalBounds(false); | 1622 gfx::Rect lb = GetLocalBounds(false); |
1623 | 1623 |
1624 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( | 1624 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( |
1625 gfx::NativeTheme::LIST); | 1625 gfx::NativeTheme::LIST); |
1626 lb.Inset(border.width(), border.height()); | 1626 lb.Inset(border.width(), border.height()); |
1627 scroll_view_->SetBounds(lb); | 1627 scroll_view_->SetBounds(lb); |
1628 } | 1628 } |
OLD | NEW |