| Index: chrome/browser/ui/webui/options/browser_options_handler.h
|
| diff --git a/chrome/browser/ui/webui/options2/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h
|
| similarity index 97%
|
| rename from chrome/browser/ui/webui/options2/browser_options_handler.h
|
| rename to chrome/browser/ui/webui/options/browser_options_handler.h
|
| index 1942a5b865a4845eb40b95e41c6e7688f0e19cf1..b076df5ce2b91075d3b665c21a20525674513591 100644
|
| --- a/chrome/browser/ui/webui/options2/browser_options_handler.h
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.h
|
| @@ -2,8 +2,8 @@
|
| // 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_BROWSER_OPTIONS_HANDLER_H_
|
| -#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_
|
| +#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
|
| +#define CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -13,7 +13,7 @@
|
| #include "chrome/browser/search_engines/template_url_service_observer.h"
|
| #include "chrome/browser/shell_integration.h"
|
| #include "chrome/browser/sync/profile_sync_service_observer.h"
|
| -#include "chrome/browser/ui/webui/options2/options_ui.h"
|
| +#include "chrome/browser/ui/webui/options/options_ui.h"
|
| #include "ui/base/dialogs/select_file_dialog.h"
|
| #include "ui/base/models/table_model_observer.h"
|
|
|
| @@ -323,4 +323,4 @@ class BrowserOptionsHandler
|
|
|
| } // namespace options
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_
|
| +#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
|
|
|