summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/match_preview.cc1
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc8
-rw-r--r--chrome/browser/tab_contents/tab_contents_delegate.cc4
-rw-r--r--chrome/browser/tab_contents/tab_contents_delegate.h4
4 files changed, 0 insertions, 17 deletions
diff --git a/chrome/browser/tab_contents/match_preview.cc b/chrome/browser/tab_contents/match_preview.cc
index 3c0c43e..c8a8c21 100644
--- a/chrome/browser/tab_contents/match_preview.cc
+++ b/chrome/browser/tab_contents/match_preview.cc
@@ -110,7 +110,6 @@ class MatchPreview::TabContentsDelegateImpl : public TabContentsDelegate {
virtual bool ShouldAddNavigationsToHistory() const { return false; }
virtual void OnDidGetApplicationInfo(TabContents* tab_contents,
int32 page_id) {}
- virtual Browser* GetBrowser() { return NULL; }
virtual gfx::NativeWindow GetFrameNativeWindow() {
return match_preview_->host_->delegate() ?
match_preview_->host_->delegate()->GetFrameNativeWindow() : NULL;
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 1d2e028..c6b8876 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/blocked_plugin_manager.h"
#include "chrome/browser/blocked_popup_container.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/cert_store.h"
@@ -611,13 +610,6 @@ void TabContents::SetExtensionAppById(const std::string& extension_app_id) {
}
SkBitmap* TabContents::GetExtensionAppIcon() {
- // We don't show the big icons in tabs for TYPE_EXTENSION_APP windows because
- // for those windows, we already have a big icon in the top-left outside any
- // tab. Having big tab icons too looks kinda redonk.
- Browser* browser = delegate_ ? delegate_->GetBrowser() : NULL;
- if (browser && browser->type() == Browser::TYPE_EXTENSION_APP)
- return NULL;
-
if (extension_app_icon_.empty())
return NULL;
diff --git a/chrome/browser/tab_contents/tab_contents_delegate.cc b/chrome/browser/tab_contents/tab_contents_delegate.cc
index 18d2bfc..f19422b 100644
--- a/chrome/browser/tab_contents/tab_contents_delegate.cc
+++ b/chrome/browser/tab_contents/tab_contents_delegate.cc
@@ -148,10 +148,6 @@ void TabContentsDelegate::OnDidGetApplicationInfo(TabContents* tab_contents,
int32 page_id) {
}
-Browser* TabContentsDelegate::GetBrowser() {
- return NULL;
-}
-
gfx::NativeWindow TabContentsDelegate::GetFrameNativeWindow() {
return NULL;
}
diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h
index c01db78..2a31508 100644
--- a/chrome/browser/tab_contents/tab_contents_delegate.h
+++ b/chrome/browser/tab_contents/tab_contents_delegate.h
@@ -22,7 +22,6 @@ class Rect;
class Size;
}
-class Browser;
class DownloadItem;
class ExtensionFunctionDispatcher;
class GURL;
@@ -254,9 +253,6 @@ class TabContentsDelegate : public AutomationResourceRoutingDelegate {
virtual void OnDidGetApplicationInfo(TabContents* tab_contents,
int32 page_id);
- // Returns the browser in which the tab contents is being displayed.
- virtual Browser* GetBrowser();
-
// Returns the native window framing the view containing the tab contents.
virtual gfx::NativeWindow GetFrameNativeWindow();