| Index: chrome/browser/ui/webui/options/web_intents_settings_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/intents_settings_handler.h b/chrome/browser/ui/webui/options/web_intents_settings_handler.h
|
| similarity index 67%
|
| rename from chrome/browser/ui/webui/options/intents_settings_handler.h
|
| rename to chrome/browser/ui/webui/options/web_intents_settings_handler.h
|
| index 957284c3f04f6b41fa8b0d25c60222cb88f185f9..14cc6d2d2715569f6b7849eb0153c4ee703ad053 100644
|
| --- a/chrome/browser/ui/webui/options/intents_settings_handler.h
|
| +++ b/chrome/browser/ui/webui/options/web_intents_settings_handler.h
|
| @@ -2,30 +2,30 @@
|
| // 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_INTENTS_SETTINGS_HANDLER_H_
|
| -#define CHROME_BROWSER_UI_WEBUI_OPTIONS_INTENTS_SETTINGS_HANDLER_H_
|
| +#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_WEB_INTENTS_SETTINGS_HANDLER_H_
|
| +#define CHROME_BROWSER_UI_WEBUI_OPTIONS_WEB_INTENTS_SETTINGS_HANDLER_H_
|
| #pragma once
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "chrome/browser/ui/intents/intents_model.h"
|
| +#include "chrome/browser/ui/intents/web_intents_model.h"
|
| #include "chrome/browser/ui/webui/options/options_ui.h"
|
|
|
| class WebDataService;
|
| class WebIntentsRegistry;
|
|
|
| // Manage setting up the backing data for the web intents options page.
|
| -class IntentsSettingsHandler : public OptionsPageUIHandler,
|
| - public IntentsModel::Observer {
|
| +class WebIntentsSettingsHandler : public OptionsPageUIHandler,
|
| + public WebIntentsModel::Observer {
|
| public:
|
| - IntentsSettingsHandler();
|
| - virtual ~IntentsSettingsHandler();
|
| + WebIntentsSettingsHandler();
|
| + virtual ~WebIntentsSettingsHandler();
|
|
|
| // OptionsPageUIHandler implementation.
|
| virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
|
| virtual void RegisterMessages();
|
|
|
| - // IntentsModel::Observer implementation.
|
| + // WebIntentsModel::Observer implementation.
|
| virtual void TreeNodesAdded(ui::TreeModel* model,
|
| ui::TreeModelNode* parent,
|
| int start,
|
| @@ -36,12 +36,12 @@ class IntentsSettingsHandler : public OptionsPageUIHandler,
|
| int count) OVERRIDE;
|
| virtual void TreeNodeChanged(ui::TreeModel* model,
|
| ui::TreeModelNode* node) OVERRIDE {}
|
| - virtual void TreeModelBeginBatch(IntentsModel* model) OVERRIDE;
|
| - virtual void TreeModelEndBatch(IntentsModel* model) OVERRIDE;
|
| + virtual void TreeModelBeginBatch(WebIntentsModel* model) OVERRIDE;
|
| + virtual void TreeModelEndBatch(WebIntentsModel* model) OVERRIDE;
|
|
|
| private:
|
| - // Creates the IntentsModel if neccessary.
|
| - void EnsureIntentsModelCreated();
|
| + // Creates the WebIntentsModel if neccessary.
|
| + void EnsureWebIntentsModelCreated();
|
|
|
| // Updates search filter for cookies tree model.
|
| void UpdateSearchResults(const base::ListValue* args);
|
| @@ -53,7 +53,7 @@ class IntentsSettingsHandler : public OptionsPageUIHandler,
|
| void RemoveIntent(const base::ListValue* args);
|
|
|
| // Helper functions for removals.
|
| - void RemoveOrigin(IntentsTreeNode* node);
|
| + void RemoveOrigin(WebIntentsTreeNode* node);
|
| void RemoveService(ServiceTreeNode* snode);
|
|
|
| // Trigger for SendChildren to load the JS model.
|
| @@ -61,18 +61,18 @@ class IntentsSettingsHandler : public OptionsPageUIHandler,
|
|
|
| // Get children nodes data and pass it to 'IntentsView.loadChildren' to
|
| // update the WebUI.
|
| - void SendChildren(IntentsTreeNode* parent);
|
| + void SendChildren(WebIntentsTreeNode* parent);
|
|
|
| scoped_refptr<WebDataService> web_data_service_;
|
| WebIntentsRegistry* web_intents_registry_; // Weak pointer.
|
|
|
| // Backing data model for the intents list.
|
| - scoped_ptr<IntentsModel> intents_tree_model_;
|
| + scoped_ptr<WebIntentsModel> intents_tree_model_;
|
|
|
| // Flag to indicate whether there is a batch update in progress.
|
| bool batch_update_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(IntentsSettingsHandler);
|
| + DISALLOW_COPY_AND_ASSIGN(WebIntentsSettingsHandler);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_INTENTS_SETTINGS_HANDLER_H_
|
| +#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_WEB_INTENTS_SETTINGS_HANDLER_H_
|
|
|