chrome/browser/chromeos/settings/system_settings_provider.h - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

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/settings/system_settings_provider.h

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 5 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 | « chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc ('k') | chrome/browser/chromeos/settings/system_settings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/system_settings_provider.h

diff --git a/chrome/browser/chromeos/system_settings_provider.h b/chrome/browser/chromeos/settings/system_settings_provider.h

similarity index 83%

rename from chrome/browser/chromeos/system_settings_provider.h

rename to chrome/browser/chromeos/settings/system_settings_provider.h

index 24b304116fa776f94e8826a40f36f87ec1da0260..49ef2aa40c8cc8c47280fd8b492aeea74df1e5ab 100644

--- a/chrome/browser/chromeos/system_settings_provider.h

+++ b/chrome/browser/chromeos/settings/system_settings_provider.h

@@ -2,14 +2,14 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_

-#define CHROME_BROWSER_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_

+#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_

+#define CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_

#include <string>

#include "base/callback.h"

#include "base/memory/scoped_ptr.h"

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

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

#include "chrome/browser/chromeos/system/timezone_settings.h"

#include "third_party/icu/public/i18n/unicode/timezone.h"

@@ -47,4 +47,4 @@ class SystemSettingsProvider : public CrosSettingsProvider,

} // namespace chromeos

-#endif // CHROME_BROWSER_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_

+#endif // CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_