| Index: chrome/browser/ui/webui/options2/cookies_view_handler2.h
|
| diff --git a/chrome/browser/ui/webui/options2/cookies_view_handler2.h b/chrome/browser/ui/webui/options2/cookies_view_handler2.h
|
| index fe36cc5e098b1701f66ffd7773c395ba06bbba29..cd8a7fbd901b039c8f4e84ea42e4efafa2020119 100644
|
| --- a/chrome/browser/ui/webui/options2/cookies_view_handler2.h
|
| +++ b/chrome/browser/ui/webui/options2/cookies_view_handler2.h
|
| @@ -41,6 +41,12 @@ class CookiesViewHandler : public OptionsPageUIHandler,
|
| virtual void TreeModelEndBatch(CookiesTreeModel* model) OVERRIDE;
|
|
|
| private:
|
| + enum CookiesViewCallback {
|
| + onTreeItemAdded,
|
| + onTreeItemRemoved,
|
| + loadChildren
|
| + };
|
| +
|
| // Creates the CookiesTreeModel if neccessary.
|
| void EnsureCookiesTreeModelCreated();
|
|
|
| @@ -61,12 +67,30 @@ class CookiesViewHandler : public OptionsPageUIHandler,
|
| // update the WebUI.
|
| void SendChildren(const CookieTreeNode* parent);
|
|
|
| + // Set the context in which this view is used - regular cookies window or
|
| + // the apps cookies window.
|
| + void SetViewContext(const base::ListValue* args);
|
| +
|
| + // Return the proper callback string, depending on whether the model is
|
| + // in regular cookies mode or apps cookies mode.
|
| + std::string GetCallback(CookiesViewCallback callback,
|
| + CookiesTreeModel* model);
|
| +
|
| + // Return the proper tree model, depending on the context in which the
|
| + // view operates.
|
| + CookiesTreeModel* GetTreeModel();
|
| +
|
| // The Cookies Tree model
|
| scoped_ptr<CookiesTreeModel> cookies_tree_model_;
|
| + scoped_ptr<CookiesTreeModel> app_cookies_tree_model_;
|
|
|
| // Flag to indicate whether there is a batch update in progress.
|
| bool batch_update_;
|
|
|
| + // A flag to indicate which view is active - the apps dialog or the regular
|
| + // cookies one. This will cause different JavaScript functions to be called.
|
| + bool app_context_;
|
| +
|
| scoped_ptr<CookiesTreeModelUtil> model_util_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CookiesViewHandler);
|
|
|