chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 12189011: Split up chrome/browser/policy subdirectory

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/ui/webui/options/browser_options_handler.cc

Issue 12189011: Split up chrome/browser/policy subdirectory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase, add chrome/browser/chromeos/policy/OWNERS Created 7 years, 9 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/ui/webui/options/browser_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc

index 1ef84e7f9941d0f44e80f86b48e407af6ce35019..221deb8577b205b210f200afa3401f213f61af5e 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -26,8 +26,6 @@

#include "chrome/browser/download/download_prefs.h"

#include "chrome/browser/instant/search.h"

#include "chrome/browser/net/url_fixer_upper.h"

-#include "chrome/browser/policy/user_cloud_policy_manager.h"

-#include "chrome/browser/policy/user_cloud_policy_manager_factory.h"

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

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

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

@@ -76,8 +74,8 @@

#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

#include "grit/theme_resources.h"

-#include "third_party/skia/include/core/SkBitmap.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

+#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/webui/web_ui_util.h"