chrome/browser/views/options/advanced_contents_view.cc - Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/.

Side by Side Diff: chrome/browser/views/options/advanced_contents_view.cc

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/views/notifications/balloon_view.cc ('k') | chrome/browser/views/options/content_filter_page_view.cc » ('j') | no next file with comments »

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"	15 #include "app/combobox_model.h"

16 #include "app/gfx/canvas.h"

17 #include "app/l10n_util.h"	16 #include "app/l10n_util.h"

18 #include "app/resource_bundle.h"	17 #include "app/resource_bundle.h"

19 #include "base/file_util.h"	18 #include "base/file_util.h"

20 #include "base/i18n/rtl.h"	19 #include "base/i18n/rtl.h"

21 #include "base/message_loop.h"	20 #include "base/message_loop.h"

22 #include "base/path_service.h"	21 #include "base/path_service.h"

23 #include "base/thread.h"	22 #include "base/thread.h"

24 #include "chrome/browser/browser.h"	23 #include "chrome/browser/browser.h"

25 #include "chrome/browser/browser_list.h"	24 #include "chrome/browser/browser_list.h"

26 #include "chrome/browser/browser_process.h"	25 #include "chrome/browser/browser_process.h"

27 #include "chrome/browser/download/download_manager.h"	26 #include "chrome/browser/download/download_manager.h"

28 #include "chrome/browser/gears_integration.h"	27 #include "chrome/browser/gears_integration.h"

29 #include "chrome/browser/net/dns_global.h"	28 #include "chrome/browser/net/dns_global.h"

30 #include "chrome/browser/options_util.h"	29 #include "chrome/browser/options_util.h"

31 #include "chrome/browser/pref_member.h"	30 #include "chrome/browser/pref_member.h"

32 #include "chrome/browser/pref_service.h"	31 #include "chrome/browser/pref_service.h"

33 #include "chrome/browser/profile.h"	32 #include "chrome/browser/profile.h"

34 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"	33 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"

35 #include "chrome/browser/safe_browsing/safe_browsing_service.h"	34 #include "chrome/browser/safe_browsing/safe_browsing_service.h"

36 #include "chrome/browser/shell_dialogs.h"	35 #include "chrome/browser/shell_dialogs.h"

37 #include "chrome/browser/views/browser_dialogs.h"	36 #include "chrome/browser/views/browser_dialogs.h"

38 #include "chrome/browser/views/clear_browsing_data.h"	37 #include "chrome/browser/views/clear_browsing_data.h"

39 #include "chrome/browser/views/options/content_settings_window_view.h"	38 #include "chrome/browser/views/options/content_settings_window_view.h"

40 #include "chrome/browser/views/options/fonts_languages_window_view.h"	39 #include "chrome/browser/views/options/fonts_languages_window_view.h"

41 #include "chrome/browser/views/restart_message_box.h"	40 #include "chrome/browser/views/restart_message_box.h"

42 #include "chrome/common/pref_names.h"	41 #include "chrome/common/pref_names.h"

	42 #include "gfx/canvas.h"

43 #include "gfx/native_theme_win.h"	43 #include "gfx/native_theme_win.h"

44 #include "grit/app_resources.h"	44 #include "grit/app_resources.h"

45 #include "grit/chromium_strings.h"	45 #include "grit/chromium_strings.h"

46 #include "grit/generated_resources.h"	46 #include "grit/generated_resources.h"

47 #include "grit/locale_settings.h"	47 #include "grit/locale_settings.h"

48 #include "net/base/ssl_config_service_win.h"	48 #include "net/base/ssl_config_service_win.h"

49 #include "skia/ext/skia_utils_win.h"	49 #include "skia/ext/skia_utils_win.h"

50 #include "third_party/skia/include/core/SkBitmap.h"	50 #include "third_party/skia/include/core/SkBitmap.h"

51 #include "views/background.h"	51 #include "views/background.h"

52 #include "views/controls/button/checkbox.h"	52 #include "views/controls/button/checkbox.h"

(...skipping 1370 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1423	1423

1424 void AdvancedScrollViewContainer::Layout() {	1424 void AdvancedScrollViewContainer::Layout() {

1425 gfx::Rect lb = GetLocalBounds(false);	1425 gfx::Rect lb = GetLocalBounds(false);

1426	1426

1427 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(	1427 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(

1428 gfx::NativeTheme::LIST);	1428 gfx::NativeTheme::LIST);

1429 lb.Inset(border.width(), border.height());	1429 lb.Inset(border.width(), border.height());

1430 scroll_view_->SetBounds(lb);	1430 scroll_view_->SetBounds(lb);

1431 scroll_view_->Layout();	1431 scroll_view_->Layout();

1432 }	1432 }

OLD	NEW