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

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

Issue 6693054: Get rid of extensions dependency from content\browser. (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
« no previous file with comments | « content/browser/site_instance_unittest.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/tab_contents.h
===================================================================
--- content/browser/tab_contents/tab_contents.h (revision 80243)
+++ content/browser/tab_contents/tab_contents.h (working copy)
@@ -16,7 +16,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "chrome/browser/download/save_package.h"
-#include "chrome/browser/extensions/image_loading_tracker.h"
#include "chrome/browser/favicon_helper.h"
#include "chrome/browser/prefs/pref_change_registrar.h"
#include "chrome/browser/tab_contents/tab_specific_content_settings.h"
@@ -92,7 +91,6 @@
public RenderViewHostDelegate,
public RenderViewHostManager::Delegate,
public JavaScriptAppModalDialogDelegate,
- public ImageLoadingTracker::Observer,
public TabSpecificContentSettings::Delegate,
public net::NetworkChangeNotifier::OnlineStateObserver {
public:
@@ -179,32 +177,6 @@
return *favicon_helper_.get();
}
- // App extensions ------------------------------------------------------------
-
- // Sets the extension denoting this as an app. If |extension| is non-null this
- // tab becomes an app-tab. TabContents does not listen for unload events for
- // the extension. It's up to consumers of TabContents to do that.
- //
- // NOTE: this should only be manipulated before the tab is added to a browser.
- // TODO(sky): resolve if this is the right way to identify an app tab. If it
- // is, than this should be passed in the constructor.
- void SetExtensionApp(const Extension* extension);
-
- // Convenience for setting the app extension by id. This does nothing if
- // |extension_app_id| is empty, or an extension can't be found given the
- // specified id.
- void SetExtensionAppById(const std::string& extension_app_id);
-
- const Extension* extension_app() const { return extension_app_; }
- bool is_app() const { return extension_app_ != NULL; }
-
- // If an app extension has been explicitly set for this TabContents its icon
- // is returned.
- //
- // NOTE: the returned icon is larger than 16x16 (its size is
- // Extension::EXTENSION_ICON_SMALLISH).
- SkBitmap* GetExtensionAppIcon();
-
// Tab navigation state ------------------------------------------------------
// Returns the current navigation properties, which if a navigation is
@@ -303,9 +275,6 @@
int crashed_error_code() const { return crashed_error_code_; }
void SetIsCrashed(base::TerminationStatus status, int error_code);
- // Call this after updating a page action to notify clients about the changes.
- void PageActionStateChanged();
-
// Whether the tab is in the process of being destroyed.
// Added as a tentative work-around for focus related bug #4633. This allows
// us not to store focus when a tab is being closed.
@@ -979,19 +948,6 @@
const NotificationSource& source,
const NotificationDetails& details);
- // App extensions related methods:
-
- // Returns the first extension whose extent contains |url|.
- const Extension* GetExtensionContaining(const GURL& url);
-
- // Resets app_icon_ and if |extension| is non-null creates a new
- // ImageLoadingTracker to load the extension's image.
- void UpdateExtensionAppIcon(const Extension* extension);
-
- // ImageLoadingTracker::Observer.
- virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
- int index);
-
// NetworkChangeNotifier::OnlineStateObserver:
virtual void OnOnlineStateChanged(bool online);
@@ -1116,18 +1072,6 @@
// Delegates for InfoBars associated with this TabContents.
std::vector<InfoBarDelegate*> infobar_delegates_;
- // Data for app extensions ---------------------------------------------------
-
- // If non-null this tab is an app tab and this is the extension the tab was
- // created for.
- const Extension* extension_app_;
-
- // Icon for extension_app_ (if non-null) or extension_for_current_page_.
- SkBitmap extension_app_icon_;
-
- // Used for loading extension_app_icon_.
- scoped_ptr<ImageLoadingTracker> extension_app_image_loader_;
-
// Data for misc internal state ----------------------------------------------
// See capturing_contents() above.
« no previous file with comments | « content/browser/site_instance_unittest.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698