chrome/browser/chrome_browser_main.cc - Issue 336213005: Disable incognito link if parental control is on

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/browser/chrome_browser_main.cc

Issue 336213005: Disable incognito link if parental control is on (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: mmenke's comments addressed Created 6 years, 6 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:

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index ff3dc9bcfcc765b568423e2bb6b1e870402a97d7..bb37f95659d159d680b24ca9055a836f39639ceb 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -76,6 +76,7 @@

#include "chrome/browser/pref_service_flags_storage.h"

#include "chrome/browser/prefs/chrome_pref_service_factory.h"

#include "chrome/browser/prefs/command_line_pref_store.h"

+#include "chrome/browser/prefs/incognito_mode_prefs.h"

#include "chrome/browser/prefs/pref_metrics_service.h"

#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"

#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"

@@ -1532,6 +1533,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {

browser_creator_.reset();

#endif // !defined(OS_ANDROID)

+#if defined(OS_WIN)

+ IncognitoModePrefs::InitializePlatformParentalControls();

sky 2014/06/19 14:56:15 Can this be moved to chrome_browser_main_win?

guohui 2014/06/19 17:51:41 Done.

+#endif // OS_WIN

performance_monitor::PerformanceMonitor::GetInstance()->Initialize();

PostBrowserStart();

« no previous file with comments | « no previous file | chrome/browser/prefs/incognito_mode_prefs.h » ('j') | no next file with comments »