Show Flash LSOs for Pepper Flash in cookie dialog.

chrome/browser/ui/webui/options2/cookies_view_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options2/cookies_view_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 37 matching lines @@
       IDS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL },
     { "label_cookie_last_accessed", IDS_COOKIES_LAST_ACCESSED_LABEL },
     { "cookie_domain", IDS_COOKIES_DOMAIN_COLUMN_HEADER },
     { "cookie_local_data", IDS_COOKIES_DATA_COLUMN_HEADER },
     { "cookie_singular", IDS_COOKIES_SINGLE_COOKIE },
     { "cookie_plural", IDS_COOKIES_PLURAL_COOKIES },
     { "cookie_database_storage", IDS_COOKIES_DATABASE_STORAGE },
     { "cookie_indexed_db", IDS_COOKIES_INDEXED_DB },
     { "cookie_local_storage", IDS_COOKIES_LOCAL_STORAGE },
     { "cookie_app_cache", IDS_COOKIES_APPLICATION_CACHE },
+    { "cookie_flash_lso", IDS_COOKIES_FLASH_LSO },
     { "search_cookies", IDS_COOKIES_SEARCH_COOKIES },
     { "remove_cookie", IDS_COOKIES_REMOVE_LABEL },
     { "remove_all_cookie", IDS_COOKIES_REMOVE_ALL_LABEL },
     { "cookie_file_system", IDS_COOKIES_FILE_SYSTEM },
     { "label_file_system_origin", IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL },
     { "label_file_system_temporary_usage",
       IDS_COOKIES_FILE_SYSTEM_TEMPORARY_USAGE_LABEL },
     { "label_file_system_persistent_usage",
       IDS_COOKIES_FILE_SYSTEM_PERSISTENT_USAGE_LABEL },
     { "cookie_server_bound_cert", IDS_COOKIES_SERVER_BOUND_CERT },
@@ skipping 100 matching lines @@
     apps_map[std::string()] = new LocalDataContainer(
         "Site Data", std::string(),
         new BrowsingDataCookieHelper(profile->GetRequestContext()),
         new BrowsingDataDatabaseHelper(profile),
         new BrowsingDataLocalStorageHelper(profile),
         NULL,
         new BrowsingDataAppCacheHelper(profile),
         BrowsingDataIndexedDBHelper::Create(profile),
         BrowsingDataFileSystemHelper::Create(profile),
         BrowsingDataQuotaHelper::Create(profile),
-        BrowsingDataServerBoundCertHelper::Create(profile));
+        BrowsingDataServerBoundCertHelper::Create(profile),
+        BrowsingDataFlashLSOHelper::Create(profile));
     cookies_tree_model_.reset(
         new CookiesTreeModel(apps_map,
                              profile->GetExtensionSpecialStoragePolicy(),
                              false));
     cookies_tree_model_->AddCookiesTreeObserver(this);
   }
 
   if (app_context_ && !app_cookies_tree_model_.get()) {
     Profile* profile = Profile::FromWebUI(web_ui());
     ContainerMap apps_map;
     const ExtensionService* service = profile->GetExtensionService();
     if (service) {
       const ExtensionSet* extensions = service->extensions();
       for (ExtensionSet::const_iterator it = extensions->begin();
            it != extensions->end(); ++it) {
         if ((*it)->is_storage_isolated()) {
           net::URLRequestContextGetter* context_getter =
               profile->GetRequestContextForIsolatedApp((*it)->id());
           // TODO(nasko): When new types of storage are isolated, add the
           // appropriate browsing data helper objects to the constructor.
           // For now, just cookies are isolated, so other parameters are NULL.
           apps_map[(*it)->id()] = new LocalDataContainer(
               (*it)->name(), (*it)->id(),
               new BrowsingDataCookieHelper(context_getter),
-              NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+              NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

[James Hawkins, 2012/07/30 03:04:39]

Super sad face.

[markusheintz_, 2012/07/30 14:02:15]

The cookies tree mode and browsing data helper code is in a really bad shape. I
REALLY want to change this over time.

In a first step I moved all browsing data helper stuff into a separate dir. Now
I will improve the code little by little (as time and other high priority tasks
permits). I hope to turn a lot of sad faces into happy faces (including my own).

[Bernhard Bauer, 2012/07/31 00:20:03]

Markus, we should add doing something like having a small constructor with
setters to the list of things to clean up for the browsing data helpers.

[markusheintz_, 2012/07/31 15:09:13]

Yes, I'll file a bug.

         }
       }
       app_cookies_tree_model_.reset(
           new CookiesTreeModel(apps_map,
                                profile->GetExtensionSpecialStoragePolicy(),
                                false));
       app_cookies_tree_model_->AddCookiesTreeObserver(this);
     }
   }
 }
@@ skipping 70 matching lines @@
 std::string CookiesViewHandler::GetCallback(
      std::string method, CookiesTreeModel* model) {
   std::string callback("CookiesView");
 
   if (model == app_cookies_tree_model_)
     callback.append("App");
   return callback.append(".").append(method);
 }
 
 }  // namespace options2