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

Unified Diff: chrome/browser/extensions/extension_host.cc

Issue 173506: Fix crash in Linux extension shelf. (Closed)
Patch Set: Created 11 years, 4 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 | « no previous file | chrome/browser/gtk/extension_view_gtk.h » ('j') | chrome/browser/gtk/extension_view_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_host.cc
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 304a3998db1da7f64601ad8ae18fdf2d1ac69a0c..bc03f8f2b6f652090db9bf0957d85be1bb189d83 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -63,7 +63,8 @@ void ExtensionHost::CreateView(Browser* browser) {
// hierarchy.
view_->SetParentOwned(false);
#elif defined(OS_LINUX)
- view_.reset(new ExtensionViewGtk(this));
+ view_.reset(new ExtensionViewGtk(this, browser));
+ view_->Init();
#else
// TODO(port)
NOTREACHED();
@@ -298,7 +299,7 @@ void ExtensionHost::HandleMouseLeave() {
}
Browser* ExtensionHost::GetBrowser() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
if (view_.get())
return view_->browser();
#endif
« no previous file with comments | « no previous file | chrome/browser/gtk/extension_view_gtk.h » ('j') | chrome/browser/gtk/extension_view_gtk.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698