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

Side by Side Diff: chrome/browser/gtk/extension_view_gtk.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 unified diff | Download patch
« no previous file with comments | « chrome/browser/gtk/extension_view_gtk.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/gtk/extension_view_gtk.h" 5 #include "chrome/browser/gtk/extension_view_gtk.h"
6 6
7 #include "chrome/browser/extensions/extension_host.h" 7 #include "chrome/browser/extensions/extension_host.h"
8 #include "chrome/browser/renderer_host/render_view_host.h" 8 #include "chrome/browser/renderer_host/render_view_host.h"
9 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" 9 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
10 10
11 ExtensionViewGtk::ExtensionViewGtk(ExtensionHost* extension_host) 11 ExtensionViewGtk::ExtensionViewGtk(ExtensionHost* extension_host,
12 Browser* browser)
12 : is_toolstrip_(true), 13 : is_toolstrip_(true),
14 browser_(browser),
13 extension_host_(extension_host), 15 extension_host_(extension_host),
14 render_widget_host_view_(NULL) { 16 render_widget_host_view_(NULL) {
17 }
18
19 void ExtensionViewGtk::Init() {
Erik does not do reviews 2009/08/26 20:13:26 I'm not sure I see the reason to split out the Ini
15 CreateWidgetHostView(); 20 CreateWidgetHostView();
16 } 21 }
17 22
18 gfx::NativeView ExtensionViewGtk::native_view() { 23 gfx::NativeView ExtensionViewGtk::native_view() {
19 return render_widget_host_view_->native_view(); 24 return render_widget_host_view_->native_view();
20 } 25 }
21 26
22 RenderViewHost* ExtensionViewGtk::render_view_host() const { 27 RenderViewHost* ExtensionViewGtk::render_view_host() const {
23 return extension_host_->render_view_host(); 28 return extension_host_->render_view_host();
24 } 29 }
25 30
26 void ExtensionViewGtk::UpdatePreferredWidth(int pref_width) { 31 void ExtensionViewGtk::UpdatePreferredWidth(int pref_width) {
27 gtk_widget_set_size_request(native_view(), pref_width, -1); 32 gtk_widget_set_size_request(native_view(), pref_width, -1);
28 } 33 }
29 34
30 void ExtensionViewGtk::CreateWidgetHostView() { 35 void ExtensionViewGtk::CreateWidgetHostView() {
31 DCHECK(!render_widget_host_view_); 36 DCHECK(!render_widget_host_view_);
32 render_widget_host_view_ = new RenderWidgetHostViewGtk(render_view_host()); 37 render_widget_host_view_ = new RenderWidgetHostViewGtk(render_view_host());
33 render_widget_host_view_->InitAsChild(); 38 render_widget_host_view_->InitAsChild();
34 39
35 extension_host_->CreateRenderView(render_widget_host_view_); 40 extension_host_->CreateRenderView(render_widget_host_view_);
36 } 41 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/extension_view_gtk.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698