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

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

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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
« no previous file with comments | « chrome/app/DEPS ('k') | chrome/browser/android/banners/app_banner_settings_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_pattern.h"
30 #include "chrome/common/crash_keys.h" 29 #include "chrome/common/crash_keys.h"
31 #include "chrome/common/logging_chrome.h" 30 #include "chrome/common/logging_chrome.h"
32 #include "chrome/common/profiling.h" 31 #include "chrome/common/profiling.h"
33 #include "chrome/common/switch_utils.h" 32 #include "chrome/common/switch_utils.h"
34 #include "chrome/common/url_constants.h" 33 #include "chrome/common/url_constants.h"
35 #include "chrome/plugin/chrome_content_plugin_client.h" 34 #include "chrome/plugin/chrome_content_plugin_client.h"
36 #include "chrome/renderer/chrome_content_renderer_client.h" 35 #include "chrome/renderer/chrome_content_renderer_client.h"
37 #include "chrome/utility/chrome_content_utility_client.h" 36 #include "chrome/utility/chrome_content_utility_client.h"
38 #include "components/component_updater/component_updater_paths.h" 37 #include "components/component_updater/component_updater_paths.h"
38 #include "components/content_settings/core/common/content_settings_pattern.h"
39 #include "components/startup_metric_utils/startup_metric_utils.h" 39 #include "components/startup_metric_utils/startup_metric_utils.h"
40 #include "content/public/common/content_client.h" 40 #include "content/public/common/content_client.h"
41 #include "content/public/common/content_paths.h" 41 #include "content/public/common/content_paths.h"
42 #include "extensions/common/constants.h" 42 #include "extensions/common/constants.h"
43 #include "ui/base/ui_base_switches.h" 43 #include "ui/base/ui_base_switches.h"
44 44
45 #if defined(OS_WIN) 45 #if defined(OS_WIN)
46 #include <atlbase.h> 46 #include <atlbase.h>
47 #include <malloc.h> 47 #include <malloc.h>
48 #include <algorithm> 48 #include <algorithm>
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 } 934 }
935 935
936 content::ContentUtilityClient* 936 content::ContentUtilityClient*
937 ChromeMainDelegate::CreateContentUtilityClient() { 937 ChromeMainDelegate::CreateContentUtilityClient() {
938 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 938 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
939 return NULL; 939 return NULL;
940 #else 940 #else
941 return g_chrome_content_utility_client.Pointer(); 941 return g_chrome_content_utility_client.Pointer();
942 #endif 942 #endif
943 } 943 }
OLDNEW
« no previous file with comments | « chrome/app/DEPS ('k') | chrome/browser/android/banners/app_banner_settings_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698