Move blocked content from TabContents to TabContentsWrapper.

chrome/browser/ui/browser.h

 // Copyright (c) 2011 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_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 10 matching lines @@
 #include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/instant/instant_delegate.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/tabs/tab_handler.h"
 #include "chrome/browser/tabs/tab_strip_model_delegate.h"  // TODO(beng): remove
 #include "chrome/browser/tabs/tab_strip_model_observer.h"  // TODO(beng): remove
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/content_settings/content_settings_tab_helper_delegate.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/page_transition_types.h"
 #include "content/common/page_zoom.h"
@@ skipping 14 matching lines @@
 class TabStripModel;
 struct WebApplicationInfo;
 namespace gfx {
 class Point;
 }
 
 class Browser : public TabHandlerDelegate,
                 public TabContentsDelegate,
                 public TabContentsWrapperDelegate,
                 public SearchEngineTabHelperDelegate,
+                public ContentSettingsTabHelperDelegate,
                 public PageNavigator,
                 public CommandUpdater::CommandUpdaterDelegate,
                 public NotificationObserver,
                 public SelectFileDialog::Listener,
                 public TabRestoreServiceObserver,
                 public ProfileSyncServiceObserver,
                 public InstantDelegate {
  public:
   // SessionService::WindowType mirrors these values.  If you add to this
   // enum, look at SessionService::WindowType to see if it needs to be
@@ skipping 727 matching lines @@
                             const NavigationEntry::SSLStatus& ssl,
                             bool show_history);
   virtual void ViewSourceForTab(TabContents* source, const GURL& page_url);
   virtual void ViewSourceForFrame(TabContents* source,
                                   const GURL& frame_url,
                                   const std::string& frame_content_state);
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                         bool* is_keyboard_shortcut);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
   virtual void ShowRepostFormWarningDialog(TabContents* tab_contents);
-  virtual void ShowContentSettingsPage(ContentSettingsType content_type);
-  virtual void ShowCollectedCookiesDialog(TabContents* tab_contents);
   virtual bool ShouldAddNavigationToHistory(
       const history::HistoryAddPageArgs& add_page_args,
       NavigationType::Type navigation_type);
   virtual void ContentRestrictionsChanged(TabContents* source);
   virtual void WorkerCrashed();
 
   // Overridden from TabContentsWrapperDelegate:
   virtual void URLStarredChanged(TabContentsWrapper* source,
                                  bool starred) OVERRIDE;
   virtual void OnDidGetApplicationInfo(TabContentsWrapper* source,
                                        int32 page_id) OVERRIDE;
   virtual void OnInstallApplication(
       TabContentsWrapper* source,
       const WebApplicationInfo& app_info) OVERRIDE;
 
   // Overridden from SearchEngineTabHelperDelegate:
   virtual void ConfirmSetDefaultSearchProvider(
       TabContents* tab_contents,
       TemplateURL* template_url,
       TemplateURLModel* template_url_model) OVERRIDE;
   virtual void ConfirmAddSearchProvider(const TemplateURL* template_url,
                                         Profile* profile) OVERRIDE;
 
+  // Overridden from ContentSettingsTabHelperDelegate:
+  virtual TabContentsWrapper* GetConstrainingContents(
+      TabContentsWrapper* source) OVERRIDE;
+  virtual void ShowContentSettingsPage(
+      ContentSettingsType content_type) OVERRIDE;
+  virtual void ShowCollectedCookiesDialog(TabContents* tab_contents) OVERRIDE;
+
   // Overridden from SelectFileDialog::Listener:
   virtual void FileSelected(const FilePath& path, int index, void* params);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Overridden from ProfileSyncServiceObserver:
   virtual void OnStateChanged();
@@ skipping 327 matching lines @@
   // Helper which implements the TabRestoreServiceDelegate interface.
   scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;
 
   scoped_ptr<InstantController> instant_;
   scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_