| Index: chrome/browser/ui/webui/sync_setup_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.h b/chrome/browser/ui/webui/sync_setup_handler.h
|
| similarity index 91%
|
| rename from chrome/browser/ui/webui/options/sync_setup_handler.h
|
| rename to chrome/browser/ui/webui/sync_setup_handler.h
|
| index 0065eccb97f0f482481c2c870fa79894f84f5ea0..0278b37cbf41c22a79e839bdc41028e03d6dd1fd 100644
|
| --- a/chrome/browser/ui/webui/options/sync_setup_handler.h
|
| +++ b/chrome/browser/ui/webui/sync_setup_handler.h
|
| @@ -2,15 +2,16 @@
|
| // 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_SYNC_SETUP_HANDLER_H_
|
| -#define CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_
|
| +#ifndef CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_
|
| +#define CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_
|
|
|
| #include "base/gtest_prod_util.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/timer/timer.h"
|
| #include "chrome/browser/sync/sync_startup_tracker.h"
|
| -#include "chrome/browser/ui/webui/options/options_ui.h"
|
| #include "chrome/browser/ui/webui/signin/login_ui_service.h"
|
| +#include "content/public/browser/web_ui_message_handler.h"
|
|
|
| class LoginUIService;
|
| class ProfileSyncService;
|
| @@ -18,17 +19,17 @@ class SigninManagerBase;
|
|
|
| namespace content {
|
| class WebContents;
|
| +class WebUI;
|
| }
|
|
|
| -class SyncSetupHandler : public options::OptionsPageUIHandler,
|
| +class SyncSetupHandler : public content::WebUIMessageHandler,
|
| public SyncStartupTracker::Observer,
|
| public LoginUIService::LoginUI {
|
| public:
|
| - SyncSetupHandler();
|
| + explicit SyncSetupHandler(content::WebUI* web_ui);
|
| ~SyncSetupHandler() override;
|
|
|
| - // OptionsPageUIHandler implementation.
|
| - void GetLocalizedValues(base::DictionaryValue* localized_strings) override;
|
| + // content::WebUIMessageHandler implementation.
|
| void RegisterMessages() override;
|
|
|
| // SyncStartupTracker::Observer implementation;
|
| @@ -39,10 +40,6 @@ class SyncSetupHandler : public options::OptionsPageUIHandler,
|
| void FocusUI() override;
|
| void CloseUI() override;
|
|
|
| - static void GetStaticLocalizedValues(
|
| - base::DictionaryValue* localized_strings,
|
| - content::WebUI* web_ui);
|
| -
|
| // Initializes the sync setup flow and shows the setup UI.
|
| void OpenSyncSetup();
|
|
|
| @@ -157,4 +154,4 @@ class SyncSetupHandler : public options::OptionsPageUIHandler,
|
| DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_
|
| +#endif // CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_
|
|
|