chrome/browser/chromeos/cros_settings.cc - Issue 9814030: get rid of old options pages

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/chromeos/cros_settings.cc

Issue 9814030: get rid of old options pages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more fixes Created 8 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/chromeos/cros_settings.cc

diff --git a/chrome/browser/chromeos/cros_settings.cc b/chrome/browser/chromeos/cros_settings.cc

index eb20863b76d3030a1741c162ff60f1c622302225..fe11ff62c83256209e86bf5c4264b1149be647f7 100644

--- a/chrome/browser/chromeos/cros_settings.cc

+++ b/chrome/browser/chromeos/cros_settings.cc

@@ -13,7 +13,7 @@

#include "chrome/browser/chromeos/cros_settings_provider.h"

#include "chrome/browser/chromeos/device_settings_provider.h"

#include "chrome/browser/chromeos/stub_cros_settings_provider.h"

-#include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h"

+#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "content/public/browser/notification_details.h"

@@ -284,7 +284,7 @@ CrosSettings::CrosSettings() {

AddSettingsProvider(new DeviceSettingsProvider(notify_cb));

}

// System settings are not mocked currently.

- AddSettingsProvider(new SystemSettingsProvider(notify_cb));

+ AddSettingsProvider(new options2::SystemSettingsProvider(notify_cb));

}

CrosSettings::~CrosSettings() {