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

Unified Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

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 | « chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
===================================================================
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc (revision 80243)
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc (working copy)
@@ -6,6 +6,7 @@
#include "base/auto_reset.h"
#include "base/command_line.h"
+#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tabs/tab_strip_model.h"
@@ -388,11 +389,13 @@
int model_index,
TabRendererData* data) {
SkBitmap* app_icon = NULL;
+ TabContentsWrapper* wrapper =
+ TabContentsWrapper::GetCurrentWrapperForContents(contents);
// Extension App icons are slightly larger than favicons, so only allow
// them if permitted by the model.
if (model_->delegate()->LargeIconsPermitted())
- app_icon = contents->GetExtensionAppIcon();
+ app_icon = wrapper->extension_tab_helper()->GetExtensionAppIcon();
if (app_icon)
data->favicon = *app_icon;
@@ -406,7 +409,7 @@
data->show_icon = contents->ShouldDisplayFavicon();
data->mini = model_->IsMiniTab(model_index);
data->blocked = model_->IsTabBlocked(model_index);
- data->app = contents->is_app();
+ data->app = wrapper->extension_tab_helper()->is_app();
}
void BrowserTabStripController::StartHighlightTabsForCommand(
« no previous file with comments | « chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698