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") |
11 #include <shellapi.h> | 11 #include <shellapi.h> |
12 #include <vsstyle.h> | 12 #include <vsstyle.h> |
13 #include <vssym32.h> | 13 #include <vssym32.h> |
14 | 14 |
15 #include "app/combobox_model.h" | |
16 #include "app/l10n_util.h" | 15 #include "app/l10n_util.h" |
17 #include "app/resource_bundle.h" | 16 #include "app/resource_bundle.h" |
18 #include "base/file_util.h" | 17 #include "base/file_util.h" |
19 #include "base/i18n/rtl.h" | 18 #include "base/i18n/rtl.h" |
20 #include "base/message_loop.h" | 19 #include "base/message_loop.h" |
21 #include "base/path_service.h" | 20 #include "base/path_service.h" |
22 #include "base/thread.h" | 21 #include "base/thread.h" |
23 #include "chrome/browser/browser.h" | 22 #include "chrome/browser/browser.h" |
24 #include "chrome/browser/browser_list.h" | 23 #include "chrome/browser/browser_list.h" |
25 #include "chrome/browser/browser_process.h" | 24 #include "chrome/browser/browser_process.h" |
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1406 // AdvancedScrollViewContainer, views::View overrides: | 1405 // AdvancedScrollViewContainer, views::View overrides: |
1407 | 1406 |
1408 void AdvancedScrollViewContainer::Layout() { | 1407 void AdvancedScrollViewContainer::Layout() { |
1409 gfx::Rect lb = GetLocalBounds(false); | 1408 gfx::Rect lb = GetLocalBounds(false); |
1410 | 1409 |
1411 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( | 1410 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( |
1412 gfx::NativeTheme::LIST); | 1411 gfx::NativeTheme::LIST); |
1413 lb.Inset(border.width(), border.height()); | 1412 lb.Inset(border.width(), border.height()); |
1414 scroll_view_->SetBounds(lb); | 1413 scroll_view_->SetBounds(lb); |
1415 } | 1414 } |
OLD | NEW |