chrome/browser/ui/views/options/advanced_contents_view.cc - Issue 6485017: Carnitas: move browser/ui/shell_dialogs.{h,cc} to browser/ui

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

Issue 6485017: Carnitas: move browser/ui/shell_dialogs.{h,cc} to browser/ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 2 more cases Created 9 years, 10 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/ui/shell_dialogs.cc ('k') | chrome/browser/ui/views/options/fonts_page_view.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/ui/views/options/advanced_contents_view.h"	5 #include "chrome/browser/ui/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 19 matching lines...) Expand all Loading...
30 #include "chrome/browser/gears_integration.h"	30 #include "chrome/browser/gears_integration.h"

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

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

33 #include "chrome/browser/prefs/pref_set_observer.h"	33 #include "chrome/browser/prefs/pref_set_observer.h"

34 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"	34 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"

35 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"	35 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"

36 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"	36 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"

37 #include "chrome/browser/profiles/profile.h"	37 #include "chrome/browser/profiles/profile.h"

38 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"	38 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"

39 #include "chrome/browser/safe_browsing/safe_browsing_service.h"	39 #include "chrome/browser/safe_browsing/safe_browsing_service.h"

40 #include "chrome/browser/shell_dialogs.h"

41 #include "chrome/browser/ui/options/options_util.h"	40 #include "chrome/browser/ui/options/options_util.h"

42 #include "chrome/browser/ui/options/show_options_url.h"	41 #include "chrome/browser/ui/options/show_options_url.h"

	42 #include "chrome/browser/ui/shell_dialogs.h"

43 #include "chrome/browser/ui/views/browser_dialogs.h"	43 #include "chrome/browser/ui/views/browser_dialogs.h"

44 #include "chrome/browser/ui/views/clear_browsing_data.h"	44 #include "chrome/browser/ui/views/clear_browsing_data.h"

45 #include "chrome/browser/ui/views/list_background.h"	45 #include "chrome/browser/ui/views/list_background.h"

46 #include "chrome/browser/ui/views/options/content_settings_window_view.h"	46 #include "chrome/browser/ui/views/options/content_settings_window_view.h"

47 #include "chrome/browser/ui/views/options/fonts_languages_window_view.h"	47 #include "chrome/browser/ui/views/options/fonts_languages_window_view.h"

48 #include "chrome/common/chrome_switches.h"	48 #include "chrome/common/chrome_switches.h"

49 #include "chrome/common/pref_names.h"	49 #include "chrome/common/pref_names.h"

50 #include "chrome/common/url_constants.h"	50 #include "chrome/common/url_constants.h"

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

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

(...skipping 1584 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1637 // AdvancedScrollViewContainer, views::View overrides:	1637 // AdvancedScrollViewContainer, views::View overrides:

1638	1638

1639 void AdvancedScrollViewContainer::Layout() {	1639 void AdvancedScrollViewContainer::Layout() {

1640 gfx::Rect lb = GetLocalBounds();	1640 gfx::Rect lb = GetLocalBounds();

1641	1641

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

1643 gfx::NativeTheme::LIST);	1643 gfx::NativeTheme::LIST);

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

1645 scroll_view_->SetBoundsRect(lb);	1645 scroll_view_->SetBoundsRect(lb);

1646 }	1646 }

OLD	NEW