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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no DCHECK Created 6 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/i18n/rtl.h" 11 #include "base/i18n/rtl.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/metrics/statistics_recorder.h" 14 #include "base/metrics/statistics_recorder.h"
15 #include "base/metrics/stats_counters.h" 15 #include "base/metrics/stats_counters.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/process/memory.h" 17 #include "base/process/memory.h"
18 #include "base/process/process_handle.h" 18 #include "base/process/process_handle.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "build/build_config.h" 20 #include "build/build_config.h"
21 #include "chrome/browser/chrome_content_browser_client.h" 21 #include "chrome/browser/chrome_content_browser_client.h"
22 #include "chrome/browser/defaults.h" 22 #include "chrome/browser/defaults.h"
23 #include "chrome/common/chrome_constants.h" 23 #include "chrome/common/chrome_constants.h"
24 #include "chrome/common/chrome_content_client.h" 24 #include "chrome/common/chrome_content_client.h"
25 #include "chrome/common/chrome_paths.h" 25 #include "chrome/common/chrome_paths.h"
26 #include "chrome/common/chrome_paths_internal.h" 26 #include "chrome/common/chrome_paths_internal.h"
27 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/chrome_version_info.h" 28 #include "chrome/common/chrome_version_info.h"
29 #include "chrome/common/content_settings_component.h"
29 #include "chrome/common/crash_keys.h" 30 #include "chrome/common/crash_keys.h"
30 #include "chrome/common/logging_chrome.h" 31 #include "chrome/common/logging_chrome.h"
31 #include "chrome/common/profiling.h" 32 #include "chrome/common/profiling.h"
32 #include "chrome/common/switch_utils.h" 33 #include "chrome/common/switch_utils.h"
33 #include "chrome/common/url_constants.h" 34 #include "chrome/common/url_constants.h"
34 #include "chrome/plugin/chrome_content_plugin_client.h" 35 #include "chrome/plugin/chrome_content_plugin_client.h"
35 #include "chrome/renderer/chrome_content_renderer_client.h" 36 #include "chrome/renderer/chrome_content_renderer_client.h"
36 #include "chrome/utility/chrome_content_utility_client.h" 37 #include "chrome/utility/chrome_content_utility_client.h"
37 #include "components/component_updater/component_updater_paths.h" 38 #include "components/component_updater/component_updater_paths.h"
38 #include "components/startup_metric_utils/startup_metric_utils.h" 39 #include "components/startup_metric_utils/startup_metric_utils.h"
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 #endif 423 #endif
423 424
424 chrome::RegisterPathProvider(); 425 chrome::RegisterPathProvider();
425 #if defined(OS_CHROMEOS) 426 #if defined(OS_CHROMEOS)
426 chromeos::RegisterPathProvider(); 427 chromeos::RegisterPathProvider();
427 #endif 428 #endif
428 #if !defined(DISABLE_NACL) && defined(OS_LINUX) 429 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
429 nacl::RegisterPathProvider(); 430 nacl::RegisterPathProvider();
430 #endif 431 #endif
431 432
433 InitContentSettingsComponent();
434
432 // No support for ANDROID yet as DiagnosticsController needs wchar support. 435 // No support for ANDROID yet as DiagnosticsController needs wchar support.
433 // TODO(gspencer): That's not true anymore, or at least there are no w-string 436 // TODO(gspencer): That's not true anymore, or at least there are no w-string
434 // references anymore. Not sure if that means this can be enabled on Android or 437 // references anymore. Not sure if that means this can be enabled on Android or
435 // not though. As there is no easily accessible command line on Android, I'm 438 // not though. As there is no easily accessible command line on Android, I'm
436 // not sure this is a big deal. 439 // not sure this is a big deal.
437 #if !defined(OS_ANDROID) && !defined(CHROME_MULTIPLE_DLL_CHILD) 440 #if !defined(OS_ANDROID) && !defined(CHROME_MULTIPLE_DLL_CHILD)
438 // If we are in diagnostics mode this is the end of the line: after the 441 // If we are in diagnostics mode this is the end of the line: after the
439 // diagnostics are run the process will invariably exit. 442 // diagnostics are run the process will invariably exit.
440 if (command_line.HasSwitch(switches::kDiagnostics)) { 443 if (command_line.HasSwitch(switches::kDiagnostics)) {
441 diagnostics::DiagnosticsWriter::FormatType format = 444 diagnostics::DiagnosticsWriter::FormatType format =
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 } 929 }
927 930
928 content::ContentUtilityClient* 931 content::ContentUtilityClient*
929 ChromeMainDelegate::CreateContentUtilityClient() { 932 ChromeMainDelegate::CreateContentUtilityClient() {
930 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 933 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
931 return NULL; 934 return NULL;
932 #else 935 #else
933 return g_chrome_content_utility_client.Pointer(); 936 return g_chrome_content_utility_client.Pointer();
934 #endif 937 #endif
935 } 938 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698