| Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
|
| diff --git a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
|
| similarity index 85%
|
| rename from chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h
|
| rename to chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
|
| index 7f8a29fc16f8103e7cf1ff2bf12fa2823c79fa27..57b327f5e4957cd02e5efcc88d4742a380fa3363 100644
|
| --- a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h
|
| +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
|
| @@ -2,12 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
|
| -#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
|
| +#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
|
| +#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "chrome/browser/ui/webui/options2/core_options_handler.h"
|
| +#include "chrome/browser/ui/webui/options/core_options_handler.h"
|
|
|
| class PrefSetObserver;
|
|
|
| @@ -54,4 +54,4 @@ class CoreChromeOSOptionsHandler : public ::options::CoreOptionsHandler {
|
| } // namespace options
|
| } // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
|
| +#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
|
|
|