chrome/app/chrome_main_delegate.cc - Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: @vabr's comments addressed 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_mock_observer.h » ('j') | components/content_settings/core/common/embedder_variables.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/app/chrome_main_delegate.cc

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc

index 70b60716c0de9d16f5cd4ea79f3ac9e2cec86c56..9e02ae69d70b790803d8c532dbdeda55f2da62d4 100644

--- a/chrome/app/chrome_main_delegate.cc

+++ b/chrome/app/chrome_main_delegate.cc

@@ -26,6 +26,7 @@

#include "chrome/common/chrome_paths_internal.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

+#include "chrome/common/content_settings_component.h"

#include "chrome/common/crash_keys.h"

#include "chrome/common/logging_chrome.h"

#include "chrome/common/profiling.h"

@@ -429,6 +430,8 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {

nacl::RegisterPathProvider();

#endif

+ InitContentSettingsComponent();

// No support for ANDROID yet as DiagnosticsController needs wchar support.

// TODO(gspencer): That's not true anymore, or at least there are no w-string

// references anymore. Not sure if that means this can be enabled on Android or