Chromium Code Reviews Chromium Code Reviews
Issue 5512009:
Remove unneeded browser_process.h includes. (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/| 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/dom_ui/options/advanced_options_handler.h" | 5 #include "chrome/browser/dom_ui/options/advanced_options_handler.h" |
| 6 | 6 |
| 7 #include <string> | |
| 8 | |
| 7 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 8 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 9 #include "base/callback.h" | 11 #include "base/callback.h" |
| 10 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 11 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 12 #include "base/values.h" | 14 #include "base/values.h" |
| 13 #include "chrome/browser/browser_process.h" | |
| 14 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h" | 15 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h" |
| 15 #include "chrome/browser/download/download_manager.h" | 16 #include "chrome/browser/download/download_manager.h" |
| 16 #include "chrome/browser/download/download_prefs.h" | 17 #include "chrome/browser/download/download_prefs.h" |
| 17 #include "chrome/browser/google/google_util.h" | 18 #include "chrome/browser/google/google_util.h" |
| 18 #include "chrome/browser/metrics/user_metrics.h" | 19 #include "chrome/browser/metrics/user_metrics.h" |
| 19 #include "chrome/browser/prefs/pref_service.h" | 20 #include "chrome/browser/prefs/pref_service.h" |
| 20 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 21 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
| 21 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" | 22 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" |
| 22 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" | 23 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" |
| 23 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
| 24 #include "chrome/browser/tab_contents/tab_contents.h" | 25 #include "chrome/browser/tab_contents/tab_contents.h" |
| 25 #include "chrome/browser/tab_contents/tab_contents_view.h" | 26 #include "chrome/browser/tab_contents/tab_contents_view.h" |
| 26 #include "chrome/browser/ui/options/options_util.h" | 27 #include "chrome/browser/ui/options/options_util.h" |
| 27 #include "chrome/browser/ui/options/options_window.h" | 28 #include "chrome/browser/ui/options/options_window.h" |
| 28 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
| 29 #include "chrome/common/notification_service.h" | 30 #include "chrome/common/notification_service.h" |
| 30 #include "chrome/common/notification_type.h" | 31 #include "chrome/common/notification_type.h" |
| 31 #include "chrome/common/pref_names.h" | 32 #include "chrome/common/pref_names.h" |
| 32 #include "chrome/common/url_constants.h" | 33 #include "chrome/common/url_constants.h" |
| 33 #include "grit/chromium_strings.h" | 34 #include "grit/chromium_strings.h" |
| 34 #include "grit/generated_resources.h" | 35 #include "grit/generated_resources.h" |
| 35 #include "grit/locale_settings.h" | 36 #include "grit/locale_settings.h" |
| 36 | 37 |
| 37 #if !defined(OS_CHROMEOS) | 38 #if !defined(OS_CHROMEOS) |
|
James Hawkins
2010/12/05 17:58:47
#ifdef includes should be inline with the rest of
| |
| 39 #include "chrome/browser/browser_process.h" | |
| 38 #include "chrome/browser/dom_ui/options/advanced_options_utils.h" | 40 #include "chrome/browser/dom_ui/options/advanced_options_utils.h" |
| 39 #endif | 41 #endif |
| 40 | 42 |
| 41 #if defined(OS_WIN) | 43 #if defined(OS_WIN) |
|
James Hawkins
2010/12/05 17:58:47
Same as above.
| |
| 42 #include "chrome/browser/gears_integration.h" | 44 #include "chrome/browser/gears_integration.h" |
| 43 #include "net/base/ssl_config_service_win.h" | 45 #include "net/base/ssl_config_service_win.h" |
| 44 #endif | 46 #endif |
| 45 | 47 |
| 46 AdvancedOptionsHandler::AdvancedOptionsHandler() { | 48 AdvancedOptionsHandler::AdvancedOptionsHandler() { |
| 47 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) | 49 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) |
| 48 cloud_print_proxy_ui_enabled_ = true; | 50 cloud_print_proxy_ui_enabled_ = true; |
| 49 #elif !defined(OS_CHROMEOS) | 51 #elif !defined(OS_CHROMEOS) |
| 50 cloud_print_proxy_ui_enabled_ = | 52 cloud_print_proxy_ui_enabled_ = |
| 51 CommandLine::ForCurrentProcess()->HasSwitch( | 53 CommandLine::ForCurrentProcess()->HasSwitch( |
| (...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 563 FundamentalValue useSSL3Value(useSSL3Setting); | 565 FundamentalValue useSSL3Value(useSSL3Setting); |
| 564 dom_ui_->CallJavascriptFunction( | 566 dom_ui_->CallJavascriptFunction( |
| 565 L"options.AdvancedOptions.SetUseSSL3CheckboxState", | 567 L"options.AdvancedOptions.SetUseSSL3CheckboxState", |
| 566 useSSL3Value, disabledValue); | 568 useSSL3Value, disabledValue); |
| 567 FundamentalValue useTLS1Value(useTLS1Setting); | 569 FundamentalValue useTLS1Value(useTLS1Setting); |
| 568 dom_ui_->CallJavascriptFunction( | 570 dom_ui_->CallJavascriptFunction( |
| 569 L"options.AdvancedOptions.SetUseTLS1CheckboxState", | 571 L"options.AdvancedOptions.SetUseTLS1CheckboxState", |
| 570 useTLS1Value, disabledValue); | 572 useTLS1Value, disabledValue); |
| 571 } | 573 } |
| 572 #endif | 574 #endif |
| OLD | NEW |
