| Index: chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| similarity index 91%
|
| rename from chrome/browser/ui/webui/options/extension_settings_handler.h
|
| rename to chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| index cbf7fecb7380a3ca88cd27fada63bbde82bae69a..29e59591c88b5e517223ab59449324dbf0d2d638 100644
|
| --- a/chrome/browser/ui/webui/options/extension_settings_handler.h
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| @@ -2,22 +2,24 @@
|
| // 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_OPTIONS_EXTENSION_SETTINGS_HANDLER_H_
|
| -#define CHROME_BROWSER_UI_WEBUI_OPTIONS_EXTENSION_SETTINGS_HANDLER_H_
|
| +#ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
|
| +#define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
|
| #pragma once
|
|
|
| #include <set>
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/extensions/extension_install_ui.h"
|
| #include "chrome/browser/extensions/extension_uninstall_dialog.h"
|
| #include "chrome/browser/extensions/extension_warning_set.h"
|
| #include "chrome/browser/ui/select_file_dialog.h"
|
| -#include "chrome/browser/ui/webui/options/options_ui.h"
|
| #include "chrome/common/extensions/extension_resource.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| +#include "content/public/browser/render_view_host.h"
|
| +#include "content/public/browser/web_ui_message_handler.h"
|
| #include "googleurl/src/gurl.h"
|
|
|
| class Extension;
|
| @@ -47,7 +49,8 @@ struct ExtensionPage {
|
| };
|
|
|
| // Extension Settings UI handler.
|
| -class ExtensionSettingsHandler : public OptionsPageUIHandler,
|
| +class ExtensionSettingsHandler : public content::WebUIMessageHandler,
|
| + public content::NotificationObserver,
|
| public SelectFileDialog::Listener,
|
| public ExtensionUninstallDialog::Delegate {
|
| public:
|
| @@ -135,9 +138,7 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler,
|
| // WebUIMessageHandler implementation.
|
| virtual void RegisterMessages() OVERRIDE;
|
|
|
| - // OptionsUIHandler implementation.
|
| - virtual void GetLocalizedValues(
|
| - base::DictionaryValue* localized_strings) OVERRIDE;
|
| + void GetLocalizedValues(base::DictionaryValue* localized_strings);
|
|
|
| // content::NotificationObserver implementation.
|
| virtual void Observe(int type,
|
| @@ -191,7 +192,9 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler,
|
| // we do so only once.
|
| bool registered_for_notifications_;
|
|
|
| + content::NotificationRegistrar registrar_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_EXTENSION_SETTINGS_HANDLER_H_
|
| +#endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
|
|
|