OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 22 matching lines...) Expand all Loading... |
33 #include "chrome/common/pref_member.h" | 33 #include "chrome/common/pref_member.h" |
34 #include "chrome/common/pref_names.h" | 34 #include "chrome/common/pref_names.h" |
35 #include "chrome/common/resource_bundle.h" | 35 #include "chrome/common/resource_bundle.h" |
36 #include "chrome/installer/util/google_update_settings.h" | 36 #include "chrome/installer/util/google_update_settings.h" |
37 #include "chrome/views/background.h" | 37 #include "chrome/views/background.h" |
38 #include "chrome/views/checkbox.h" | 38 #include "chrome/views/checkbox.h" |
39 #include "chrome/views/combo_box.h" | 39 #include "chrome/views/combo_box.h" |
40 #include "chrome/views/grid_layout.h" | 40 #include "chrome/views/grid_layout.h" |
41 #include "chrome/views/scroll_view.h" | 41 #include "chrome/views/scroll_view.h" |
42 #include "net/base/ssl_config_service.h" | 42 #include "net/base/ssl_config_service.h" |
| 43 #include "net/base/cookie_policy.h" |
43 | 44 |
44 #include "chromium_strings.h" | 45 #include "chromium_strings.h" |
45 #include "generated_resources.h" | 46 #include "generated_resources.h" |
46 | 47 |
47 using views::GridLayout; | 48 using views::GridLayout; |
48 using views::ColumnSet; | 49 using views::ColumnSet; |
49 | 50 |
50 namespace { | 51 namespace { |
51 | 52 |
52 // A background object that paints the scrollable list background, | 53 // A background object that paints the scrollable list background, |
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1205 void AdvancedScrollViewContainer::Layout() { | 1206 void AdvancedScrollViewContainer::Layout() { |
1206 gfx::Rect lb = GetLocalBounds(false); | 1207 gfx::Rect lb = GetLocalBounds(false); |
1207 | 1208 |
1208 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( | 1209 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( |
1209 gfx::NativeTheme::LIST); | 1210 gfx::NativeTheme::LIST); |
1210 lb.Inset(border.width(), border.height()); | 1211 lb.Inset(border.width(), border.height()); |
1211 scroll_view_->SetBounds(lb); | 1212 scroll_view_->SetBounds(lb); |
1212 scroll_view_->Layout(); | 1213 scroll_view_->Layout(); |
1213 } | 1214 } |
1214 | 1215 |
OLD | NEW |