LocalSharedObjectsContainer: Separate object counting in an interface

chrome/browser/content_settings/tab_specific_content_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
+#include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/content_settings/content_settings_usages_state.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "content/public/common/media_stream_request.h"
 #include "net/cookies/canonical_cookie.h"
 
-class CookiesTreeModel;
 class HostContentSettingsMap;
 class Profile;
 
 namespace content {
 class RenderViewHost;
 }
 
 namespace net {
 class CookieOptions;
 }
@@ skipping 214 matching lines @@
   // Set whether the setting for the pending handler is DEFAULT (ignore),
   // ALLOW, or DENY.
   void set_pending_protocol_handler_setting(ContentSetting setting) {
     pending_protocol_handler_setting_ = setting;
   }
 
   ContentSetting pending_protocol_handler_setting() const {
     return pending_protocol_handler_setting_;
   }
 
-
-  // Returns a pointer to the |LocalSharedObjectsContainer| that contains all
-  // allowed local shared objects like cookies, local storage, ... .
-  const LocalSharedObjectsContainer& allowed_local_shared_objects() const {
+  // Returns the |LocalSharedObjectsCounter| instances corresponding to all
+  // allowed, and blocked, respectively, local shared objects like cookies,
+  // local storage, ... .
+  const LocalSharedObjectsCounter& allowed_local_shared_objects() const {
     return allowed_local_shared_objects_;
   }
+  const LocalSharedObjectsCounter& blocked_local_shared_objects() const {

[markusheintz_, 2014/10/01 11:12:07]

nit: pls add an empty line above

[vabr (Chromium), 2014/10/01 15:25:48]

Done.

+    return blocked_local_shared_objects_;
+  }
 
-  // Returns a pointer to the |LocalSharedObjectsContainer| that contains all
-  // blocked local shared objects like cookies, local storage, ... .
-  const LocalSharedObjectsContainer& blocked_local_shared_objects() const {
-    return blocked_local_shared_objects_;
+  // Creates a new copy of a CookiesTreeModel for all allowed, and blocked,
+  // respectively, local shared objects.
+  scoped_ptr<CookiesTreeModel> CreateAllowedCookiesTreeModel() const {
+    return allowed_local_shared_objects_.CreateCookiesTreeModel();
+  }
+  scoped_ptr<CookiesTreeModel> CreateBlockedCookiesTreeModel() const {

[markusheintz_, 2014/10/01 11:12:07]

nit: pls add an empty line above

[vabr (Chromium), 2014/10/01 15:25:48]

Done.

+    return blocked_local_shared_objects_.CreateCookiesTreeModel();
   }
 
   bool load_plugins_link_enabled() { return load_plugins_link_enabled_; }
   void set_load_plugins_link_enabled(bool enabled) {
     load_plugins_link_enabled_ = enabled;
   }
 
   // Called to indicate whether access to the Pepper broker was allowed or
   // blocked.
   void SetPepperBrokerAllowed(bool allowed);
@@ skipping 135 matching lines @@
   std::string media_stream_requested_audio_device_;
   std::string media_stream_requested_video_device_;
 
   // Observer to watch for content settings changed.
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_