| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 "chrome/browser/browser_list.h" | 21 #include "chrome/browser/browser_list.h" |
| 22 #include "chrome/browser/browser_process.h" | 22 #include "chrome/browser/browser_process.h" |
| 23 #include "chrome/browser/download/download_manager.h" | 23 #include "chrome/browser/download/download_manager.h" |
| 24 #include "chrome/browser/gears_integration.h" | 24 #include "chrome/browser/gears_integration.h" |
| 25 #include "chrome/browser/metrics/metrics_service.h" | 25 #include "chrome/browser/metrics/metrics_service.h" |
| 26 #include "chrome/browser/net/dns_global.h" | 26 #include "chrome/browser/net/dns_global.h" |
| 27 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 27 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 28 #include "chrome/browser/views/options/cookies_view.h" | 28 #include "chrome/browser/views/options/cookies_view.h" |
| 29 #include "chrome/browser/views/options/language_combobox_model.h" | 29 #include "chrome/browser/views/options/language_combobox_model.h" |
| 30 #include "chrome/browser/views/restart_message_box.h" | 30 #include "chrome/browser/views/restart_message_box.h" |
| 31 #include "chrome/browser/views/standard_layout.h" | |
| 32 #include "chrome/common/filter_policy.h" | 31 #include "chrome/common/filter_policy.h" |
| 33 #include "chrome/common/pref_member.h" | 32 #include "chrome/common/pref_member.h" |
| 34 #include "chrome/common/pref_names.h" | 33 #include "chrome/common/pref_names.h" |
| 35 #include "chrome/installer/util/google_update_settings.h" | 34 #include "chrome/installer/util/google_update_settings.h" |
| 36 #include "grit/chromium_strings.h" | 35 #include "grit/chromium_strings.h" |
| 37 #include "grit/generated_resources.h" | 36 #include "grit/generated_resources.h" |
| 38 #include "grit/locale_settings.h" | 37 #include "grit/locale_settings.h" |
| 39 #include "net/base/ssl_config_service.h" | 38 #include "net/base/ssl_config_service.h" |
| 40 #include "net/base/cookie_policy.h" | 39 #include "net/base/cookie_policy.h" |
| 41 #include "views/background.h" | 40 #include "views/background.h" |
| 42 #include "views/controls/button/checkbox.h" | 41 #include "views/controls/button/checkbox.h" |
| 43 #include "views/controls/combo_box.h" | 42 #include "views/controls/combo_box.h" |
| 44 #include "views/controls/scroll_view.h" | 43 #include "views/controls/scroll_view.h" |
| 45 #include "views/grid_layout.h" | 44 #include "views/grid_layout.h" |
| 45 #include "views/standard_layout.h" |
| 46 #include "views/widget/widget.h" | 46 #include "views/widget/widget.h" |
| 47 | 47 |
| 48 using views::GridLayout; | 48 using views::GridLayout; |
| 49 using views::ColumnSet; | 49 using views::ColumnSet; |
| 50 | 50 |
| 51 namespace { | 51 namespace { |
| 52 | 52 |
| 53 // A background object that paints the scrollable list background, | 53 // A background object that paints the scrollable list background, |
| 54 // which may be rendered by the system visual styles system. | 54 // which may be rendered by the system visual styles system. |
| 55 class ListBackground : public views::Background { | 55 class ListBackground : public views::Background { |
| (...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1174 | 1174 |
| 1175 void AdvancedScrollViewContainer::Layout() { | 1175 void AdvancedScrollViewContainer::Layout() { |
| 1176 gfx::Rect lb = GetLocalBounds(false); | 1176 gfx::Rect lb = GetLocalBounds(false); |
| 1177 | 1177 |
| 1178 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( | 1178 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( |
| 1179 gfx::NativeTheme::LIST); | 1179 gfx::NativeTheme::LIST); |
| 1180 lb.Inset(border.width(), border.height()); | 1180 lb.Inset(border.width(), border.height()); |
| 1181 scroll_view_->SetBounds(lb); | 1181 scroll_view_->SetBounds(lb); |
| 1182 scroll_view_->Layout(); | 1182 scroll_view_->Layout(); |
| 1183 } | 1183 } |
| OLD | NEW |