Adding "Clear hosted app data" checkbox to browsing data removal UI.

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

Index: chrome/browser/ui/webui/options2/clear_browser_data_handler2.h
diff --git a/chrome/browser/ui/webui/options2/clear_browser_data_handler2.h b/chrome/browser/ui/webui/options2/clear_browser_data_handler2.h
index 9e5481209a3a3f8d76fe23f1873a5c7b589e8d95..bd232c2da6f6064b5a4716d2fa7268987ede04b5 100644
--- a/chrome/browser/ui/webui/options2/clear_browser_data_handler2.h
+++ b/chrome/browser/ui/webui/options2/clear_browser_data_handler2.h
@@ -30,9 +30,17 @@ class ClearBrowserDataHandler : public OptionsPageUIHandler,
   // Javascript callback to start clearing data.
   void HandleClearBrowserData(const ListValue* value);
 
-  // Callback from BrowsingDataRemover. Closes the dialog.
+  // Callback from BrowsingDataRemover. Calls OnAllDataRemoved once both
+  // protected and unprotected data are removed.
   virtual void OnBrowsingDataRemoverDone() OVERRIDE;
 
+  // Closes the dialog once all requested data has been removed.
+  void OnAllDataRemoved();
+
+  // Clears the data of hosted apps, which is otherwise protected from deletion
+  // when the user clears regular browsing data.
+  void ClearHostedAppData();
+
   // If non-null it means removal is in progress. BrowsingDataRemover takes care
   // of deleting itself when done.
   BrowsingDataRemover* remover_;
@@ -40,6 +48,10 @@ class ClearBrowserDataHandler : public OptionsPageUIHandler,
   // Keeps track of whether clearing LSO data is supported.
   BooleanPrefMember clear_plugin_lso_data_enabled_;
 
+  // Indicates that we also need to delete hosted app data after finishing the
+  // first removal operation.
+  bool remove_hosted_app_data_pending_;
+
   DISALLOW_COPY_AND_ASSIGN(ClearBrowserDataHandler);
 };