Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: content/browser/tab_contents/tab_contents.h

Issue 6794035: Move dispatching and sending of the last extension specific messages out of TabContents and Rende... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/tab_contents/tab_contents.h
===================================================================
--- content/browser/tab_contents/tab_contents.h (revision 80315)
+++ content/browser/tab_contents/tab_contents.h (working copy)
@@ -30,6 +30,7 @@
#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"
@@ -217,13 +218,6 @@
// 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_; }
@@ -243,10 +237,6 @@
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
@@ -376,12 +366,6 @@
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);
@@ -663,6 +647,16 @@
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);
@@ -728,8 +722,6 @@
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,
@@ -995,9 +987,6 @@
// Handles downloading favicons.
scoped_ptr<FaviconHelper> favicon_helper_;
- // Cached web app info data.
- WebApplicationInfo web_app_info_;
-
// Cached web app icon.
SkBitmap app_icon_;

Powered by Google App Engine
This is Rietveld 408576698