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

Unified Diff: chrome/browser/ui/views/extensions/shell_window_views.cc

Issue 11222003: Remove TabContents creation from ShellWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: const fix Created 8 years, 2 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: chrome/browser/ui/views/extensions/shell_window_views.cc
diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc
index adbf9c0964847a0c22cff2f9094af513b781f240..a76b8c89e3d416de98ea366adb1108c3912da118 100644
--- a/chrome/browser/ui/views/extensions/shell_window_views.cc
+++ b/chrome/browser/ui/views/extensions/shell_window_views.cc
@@ -7,7 +7,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
#include "chrome/common/extensions/draggable_region.h"
#include "chrome/common/extensions/extension.h"
@@ -595,10 +594,10 @@ gfx::ImageSkia ShellWindowViews::GetWindowAppIcon() {
}
gfx::ImageSkia ShellWindowViews::GetWindowIcon() {
- TabContents* contents = shell_window_->tab_contents();
- if (contents) {
+ content::WebContents* web_contents = shell_window_->web_contents();
+ if (web_contents) {
FaviconTabHelper* favicon_tab_helper =
- FaviconTabHelper::FromWebContents(contents->web_contents());
+ FaviconTabHelper::FromWebContents(web_contents);
gfx::Image app_icon = favicon_tab_helper->GetFavicon();
if (!app_icon.IsEmpty())
return *app_icon.ToImageSkia();

Powered by Google App Engine
This is Rietveld 408576698