Adding Application Data dialog for isolated apps

chrome/browser/ui/webui/options2/cookies_view_handler2.h

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 19e41105477890c8b1e6ee8e6b5562b300621430..6684bbe97ba621a57cb3c2a0c8cdd8e0e8b580de 100644
--- a/chrome/browser/ui/webui/options2/cookies_view_handler2.h
+++ b/chrome/browser/ui/webui/options2/cookies_view_handler2.h
@@ -39,6 +39,12 @@ class CookiesViewHandler : public OptionsPageUIHandler,
   virtual void TreeModelEndBatch(CookiesTreeModel* model) OVERRIDE;
 
  private:
+  enum CookiesViewCallback {
+    onTreeItemAdded,

[Evan Stade, 2012/07/03 18:11:28]

don't see where this is used

[nasko, 2012/07/09 17:07:06]

Re-added the common function, so it is now used.

+    onTreeItemRemoved,
+    loadChildren
+  };
+
   // Creates the CookiesTreeModel if neccessary.
   void EnsureCookiesTreeModelCreated();
 
@@ -59,12 +65,30 @@ class CookiesViewHandler : public OptionsPageUIHandler,
   // update the WebUI.
   void SendChildren(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);
+
+  // 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_;
 
+  // Flag to indicate whether the view is used in the apps dialog context or

[Evan Stade, 2012/07/03 18:11:28]

I don't think this makes much sense. Can you rephrase it? Something like:

a flag to indicate which view is active...

[nasko, 2012/07/09 17:07:06]

Done.

+  // the regular cookies context. This will cause different callbacks into
+  // JavaScript to be called.
+  bool app_context_;
+
   DISALLOW_COPY_AND_ASSIGN(CookiesViewHandler);
 };