Move dispatching and sending of the last extension specific messages out of TabContents and Rende...

content/browser/tab_contents/tab_contents.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 CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 12 matching lines @@
 #include "chrome/common/instant_types.h"
 #include "chrome/common/translate_errors.h"
 #include "chrome/common/web_apps.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/tab_contents/constrained_window.h"
 #include "content/browser/tab_contents/language_state.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/render_view_host_manager.h"
+#include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/property_bag.h"
 #include "content/common/renderer_preferences.h"
 #include "net/base/load_states.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
@@ skipping 167 matching lines @@
   // entry.
   SkBitmap GetFavicon() const;
 
   // Returns true if we are not using the default favicon.
   bool FaviconIsValid() const;
 
   // Returns whether the favicon should be displayed. If this returns false, no
   // space is provided for the favicon, and the favicon is never displayed.
   virtual bool ShouldDisplayFavicon();
 
-  // Add and remove observers for page navigation notifications. Adding or
-  // removing multiple times has no effect. The order in which notifications
-  // are sent to observers is undefined. Clients must be sure to remove the
-  // observer before they go away.
-  void AddObserver(TabContentsObserver* observer);
-  void RemoveObserver(TabContentsObserver* observer);
-
   // Return whether this tab contents is loading a resource.
   bool is_loading() const { return is_loading_; }
 
   // Returns whether this tab contents is waiting for a first-response for the
   // main resource of the page. This controls whether the throbber state is
   // "waiting" or "loading."
   bool waiting_for_response() const { return waiting_for_response_; }
 
   net::LoadState load_state() const { return load_state_; }
   string16 load_state_host() const { return load_state_host_; }
   uint64 upload_size() const { return upload_size_; }
   uint64 upload_position() const { return upload_position_; }
 
   const std::string& encoding() const { return encoding_; }
   void set_encoding(const std::string& encoding);
   void reset_encoding() {
     encoding_.clear();
   }
 
-  const WebApplicationInfo& web_app_info() const {
-    return web_app_info_;
-  }
-
   const SkBitmap& app_icon() const { return app_icon_; }
 
   // Sets an app icon associated with TabContents and fires an INVALIDATE_TITLE
   // navigation state change to trigger repaint of title.
   void SetAppIcon(const SkBitmap& app_icon);
 
   bool displayed_insecure_content() const {
     return displayed_insecure_content_;
   }
 
@@ skipping 109 matching lines @@
   // the returned ConstrainedWindow might not yet be visible.
   ConstrainedWindow* CreateConstrainedDialog(
       ConstrainedWindowDelegate* delegate);
 
   // Adds a new tab or window with the given already-created contents
   void AddNewContents(TabContents* new_contents,
                       WindowOpenDisposition disposition,
                       const gfx::Rect& initial_pos,
                       bool user_gesture);
 
-  // Execute code in this tab. Returns true if the message was successfully
-  // sent.
-  bool ExecuteCode(int request_id, const std::string& extension_id,
-                   bool is_js_code, const std::string& code_string,
-                   bool all_frames);
-
   // Called when the blocked popup notification is shown or hidden.
   virtual void PopupNotificationVisibilityChanged(bool visible);
 
   // Returns the number of constrained windows in this tab.  Used by tests.
   size_t constrained_window_count() { return child_windows_.size(); }
 
   typedef std::deque<ConstrainedWindow*> ConstrainedWindowList;
 
   // Return an iterator for the first constrained window in this tab contents.
   ConstrainedWindowList::iterator constrained_window_begin()
@@ skipping 261 matching lines @@
   void SetContentRestrictions(int restrictions);
 
   safe_browsing::ClientSideDetectionHost* safebrowsing_detection_host() {
     return safebrowsing_detection_host_.get();
   }
 
   // Query the WebUIFactory for the TypeID for the current URL.
   WebUI::TypeID GetWebUITypeForCurrentState();
 
  protected:
+  friend class TabContentsObserver;
+  friend class TabContentsObserver::Registrar;
+
+  // Add and remove observers for page navigation notifications. Adding or
+  // removing multiple times has no effect. The order in which notifications
+  // are sent to observers is undefined. Clients must be sure to remove the
+  // observer before they go away.
+  void AddObserver(TabContentsObserver* observer);
+  void RemoveObserver(TabContentsObserver* observer);
+
   // from RenderViewHostDelegate.
   virtual bool OnMessageReceived(const IPC::Message& message);
 
  private:
   friend class NavigationController;
   // Used to access the child_windows_ (ConstrainedWindowList) for testing
   // automation purposes.
   friend class TestingAutomationProvider;
 
   FRIEND_TEST_ALL_PREFIXES(TabContentsTest, NoJSMessageOnInterstitials);
@@ skipping 45 matching lines @@
                                         const std::string& security_info);
   void OnDidDisplayInsecureContent();
   void OnDidRunInsecureContent(const std::string& security_origin,
                                const GURL& target_url);
   void OnDocumentLoadedInFrame(int64 frame_id);
   void OnDidFinishLoad(int64 frame_id);
   void OnUpdateContentRestrictions(int restrictions);
   void OnPDFHasUnsupportedFeature();
 
   void OnGoToEntryAtOffset(int offset);
-  void OnDidGetApplicationInfo(int32 page_id, const WebApplicationInfo& info);
-  void OnInstallApplication(const WebApplicationInfo& info);
   void OnPageContents(const GURL& url,
                       int32 page_id,
                       const string16& contents,
                       const std::string& language,
                       bool page_translatable);
   void OnPageTranslated(int32 page_id,
                         const std::string& original_lang,
                         const std::string& translated_lang,
                         TranslateErrors::Type error_type);
 
@@ skipping 245 matching lines @@
 
   // TabContentsSSLHelper, lazily created.
   scoped_ptr<TabContentsSSLHelper> ssl_helper_;
 
   // Handles drag and drop event forwarding to extensions.
   BookmarkDrag* bookmark_drag_;
 
   // Handles downloading favicons.
   scoped_ptr<FaviconHelper> favicon_helper_;
 
-  // Cached web app info data.
-  WebApplicationInfo web_app_info_;
-
   // Cached web app icon.
   SkBitmap app_icon_;
 
   // RenderViewHost::ContentSettingsDelegate.
   scoped_ptr<TabSpecificContentSettings> content_settings_delegate_;
 
   // Handles desktop notification IPCs.
   scoped_ptr<DesktopNotificationHandlerForTC> desktop_notification_handler_;
 
   // Handles IPCs related to SafeBrowsing client-side phishing detection.
@@ skipping 136 matching lines @@
   ObserverList<TabContentsObserver> observers_;
 
   // Content restrictions, used to disable print/copy etc based on content's
   // (full-page plugins for now only) permissions.
   int content_restrictions_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_