Commit 68000152 authored by ben@chromium.org's avatar ben@chromium.org

Fixing more bustage by ifdefing out Windows-only code.

TBR=brettw
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/115914

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17173 0039d316-1c4b-4281-b951-d872f2087c98
parent 673aad7b
...@@ -29,7 +29,11 @@ ...@@ -29,7 +29,11 @@
#include "webkit/glue/context_menu.h" #include "webkit/glue/context_menu.h"
ExtensionHost::ExtensionHost(Extension* extension, SiteInstance* site_instance) ExtensionHost::ExtensionHost(Extension* extension, SiteInstance* site_instance)
: extension_(extension), view_(NULL), did_stop_loading_(false) { : extension_(extension),
#if defined(OS_WIN)
view_(NULL),
#endif
did_stop_loading_(false) {
render_view_host_ = new RenderViewHost( render_view_host_ = new RenderViewHost(
site_instance, this, MSG_ROUTING_NONE, NULL); site_instance, this, MSG_ROUTING_NONE, NULL);
render_view_host_->AllowExtensionBindings(); render_view_host_->AllowExtensionBindings();
...@@ -52,8 +56,10 @@ void ExtensionHost::CreateRenderView(const GURL& url, ...@@ -52,8 +56,10 @@ void ExtensionHost::CreateRenderView(const GURL& url,
} }
void ExtensionHost::UpdatePreferredWidth(int pref_width) { void ExtensionHost::UpdatePreferredWidth(int pref_width) {
#if defined(OS_WIN)
if (view_) if (view_)
view_->DidContentsPreferredWidthChange(pref_width); view_->DidContentsPreferredWidthChange(pref_width);
#endif
} }
WebPreferences ExtensionHost::GetWebkitPrefs() { WebPreferences ExtensionHost::GetWebkitPrefs() {
...@@ -86,8 +92,10 @@ void ExtensionHost::DidStopLoading(RenderViewHost* render_view_host) { ...@@ -86,8 +92,10 @@ void ExtensionHost::DidStopLoading(RenderViewHost* render_view_host) {
render_view_host->WasResized(); render_view_host->WasResized();
did_stop_loading_ = true; did_stop_loading_ = true;
#if defined(OS_WIN)
if (view_) if (view_)
view_->ShowIfCompletelyLoaded(); view_->ShowIfCompletelyLoaded();
#endif
} }
ExtensionFunctionDispatcher* ExtensionHost:: ExtensionFunctionDispatcher* ExtensionHost::
...@@ -158,18 +166,24 @@ void ExtensionHost::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { ...@@ -158,18 +166,24 @@ void ExtensionHost::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
} }
void ExtensionHost::HandleMouseEvent() { void ExtensionHost::HandleMouseEvent() {
#if defined(OS_WIN)
if (view_) if (view_)
view_->HandleMouseEvent(); view_->HandleMouseEvent();
#endif
} }
void ExtensionHost::HandleMouseLeave() { void ExtensionHost::HandleMouseLeave() {
#if defined(OS_WIN)
if (view_) if (view_)
view_->HandleMouseLeave(); view_->HandleMouseLeave();
#endif
} }
Browser* ExtensionHost::GetBrowser() { Browser* ExtensionHost::GetBrowser() {
#if defined(OS_WIN)
if (view_) if (view_)
return view_->browser(); return view_->browser();
#endif
Browser* browser = BrowserList::GetLastActiveWithProfile( Browser* browser = BrowserList::GetLastActiveWithProfile(
render_view_host()->process()->profile()); render_view_host()->process()->profile());
// TODO(mpcomplete): what this verifies doesn't actually happen yet. // TODO(mpcomplete): what this verifies doesn't actually happen yet.
......
...@@ -27,8 +27,10 @@ class ExtensionHost : public RenderViewHostDelegate, ...@@ -27,8 +27,10 @@ class ExtensionHost : public RenderViewHostDelegate,
ExtensionHost(Extension* extension, SiteInstance* site_instance); ExtensionHost(Extension* extension, SiteInstance* site_instance);
~ExtensionHost(); ~ExtensionHost();
#if defined(OS_WIN)
void set_view(ExtensionView* view) { view_ = view; } void set_view(ExtensionView* view) { view_ = view; }
ExtensionView* view() const { return view_; } ExtensionView* view() const { return view_; }
#endif
Extension* extension() { return extension_; } Extension* extension() { return extension_; }
RenderViewHost* render_view_host() const { return render_view_host_; } RenderViewHost* render_view_host() const { return render_view_host_; }
SiteInstance* site_instance() const; SiteInstance* site_instance() const;
...@@ -84,8 +86,10 @@ class ExtensionHost : public RenderViewHostDelegate, ...@@ -84,8 +86,10 @@ class ExtensionHost : public RenderViewHostDelegate,
// The extension that we're hosting in this view. // The extension that we're hosting in this view.
Extension* extension_; Extension* extension_;
#if defined(OS_WIN)
// Optional view that shows the rendered content in the UI. // Optional view that shows the rendered content in the UI.
ExtensionView* view_; ExtensionView* view_;
#endif
// The host for our HTML content. // The host for our HTML content.
RenderViewHost* render_view_host_; RenderViewHost* render_view_host_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment