Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(788)

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

Issue 6260001: Cleanup: Remove unneeded chrome/browser/ui/browser.h usage.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
OLDNEW
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")
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 <string>
16
15 #include "app/l10n_util.h" 17 #include "app/l10n_util.h"
16 #include "app/resource_bundle.h" 18 #include "app/resource_bundle.h"
17 #include "base/command_line.h" 19 #include "base/command_line.h"
18 #include "base/file_util.h" 20 #include "base/file_util.h"
19 #include "base/i18n/rtl.h" 21 #include "base/i18n/rtl.h"
20 #include "base/message_loop.h" 22 #include "base/message_loop.h"
21 #include "base/path_service.h" 23 #include "base/path_service.h"
22 #include "base/scoped_callback_factory.h" 24 #include "base/scoped_callback_factory.h"
23 #include "base/threading/thread.h" 25 #include "base/threading/thread.h"
24 #include "base/utf_string_conversions.h" 26 #include "base/utf_string_conversions.h"
25 #include "chrome/browser/browser_list.h" 27 #include "chrome/browser/browser_list.h"
26 #include "chrome/browser/browser_process.h" 28 #include "chrome/browser/browser_process.h"
27 #include "chrome/browser/download/download_manager.h" 29 #include "chrome/browser/download/download_manager.h"
28 #include "chrome/browser/download/download_prefs.h" 30 #include "chrome/browser/download/download_prefs.h"
29 #include "chrome/browser/google/google_util.h" 31 #include "chrome/browser/google/google_util.h"
30 #include "chrome/browser/gears_integration.h" 32 #include "chrome/browser/gears_integration.h"
31 #include "chrome/browser/prefs/pref_member.h" 33 #include "chrome/browser/prefs/pref_member.h"
32 #include "chrome/browser/prefs/pref_service.h" 34 #include "chrome/browser/prefs/pref_service.h"
33 #include "chrome/browser/prefs/pref_set_observer.h" 35 #include "chrome/browser/prefs/pref_set_observer.h"
34 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 36 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
35 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 37 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
36 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" 38 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
37 #include "chrome/browser/profiles/profile.h" 39 #include "chrome/browser/profiles/profile.h"
38 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 40 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
39 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 41 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
40 #include "chrome/browser/shell_dialogs.h" 42 #include "chrome/browser/shell_dialogs.h"
41 #include "chrome/browser/ui/browser.h"
42 #include "chrome/browser/ui/options/options_util.h" 43 #include "chrome/browser/ui/options/options_util.h"
43 #include "chrome/browser/ui/options/show_options_url.h" 44 #include "chrome/browser/ui/options/show_options_url.h"
44 #include "chrome/browser/ui/views/browser_dialogs.h" 45 #include "chrome/browser/ui/views/browser_dialogs.h"
45 #include "chrome/browser/ui/views/clear_browsing_data.h" 46 #include "chrome/browser/ui/views/clear_browsing_data.h"
46 #include "chrome/browser/ui/views/list_background.h" 47 #include "chrome/browser/ui/views/list_background.h"
47 #include "chrome/browser/ui/views/options/content_settings_window_view.h" 48 #include "chrome/browser/ui/views/options/content_settings_window_view.h"
48 #include "chrome/browser/ui/views/options/fonts_languages_window_view.h" 49 #include "chrome/browser/ui/views/options/fonts_languages_window_view.h"
49 #include "chrome/common/chrome_switches.h" 50 #include "chrome/common/chrome_switches.h"
50 #include "chrome/common/pref_names.h" 51 #include "chrome/common/pref_names.h"
51 #include "chrome/common/url_constants.h" 52 #include "chrome/common/url_constants.h"
(...skipping 1584 matching lines...) Expand 10 before | Expand all | Expand 10 after
1636 // AdvancedScrollViewContainer, views::View overrides: 1637 // AdvancedScrollViewContainer, views::View overrides:
1637 1638
1638 void AdvancedScrollViewContainer::Layout() { 1639 void AdvancedScrollViewContainer::Layout() {
1639 gfx::Rect lb = GetLocalBounds(false); 1640 gfx::Rect lb = GetLocalBounds(false);
1640 1641
1641 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( 1642 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
1642 gfx::NativeTheme::LIST); 1643 gfx::NativeTheme::LIST);
1643 lb.Inset(border.width(), border.height()); 1644 lb.Inset(border.width(), border.height());
1644 scroll_view_->SetBounds(lb); 1645 scroll_view_->SetBounds(lb);
1645 } 1646 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/html_dialog_view.cc ('k') | chrome/browser/ui/views/options/content_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698