diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 10:00:26 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 10:00:26 +0000 |
| commit | 8f6d761251617aff0f0201f523ffe97a58907f0b (patch) | |
| tree | cce920552502bd3dc08e52d0c2405b9df7f7e5a8 | |
| parent | 685e2846c3fd819c8e9b6671f3be4a61e4e04548 (diff) | |
| download | chromium_src-8f6d761251617aff0f0201f523ffe97a58907f0b.zip chromium_src-8f6d761251617aff0f0201f523ffe97a58907f0b.tar.gz chromium_src-8f6d761251617aff0f0201f523ffe97a58907f0b.tar.bz2 | |
Moar build fix for enable_plugins=0
TBR=marja@chromium.org
Review URL: https://codereview.chromium.org/15777006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202396 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/shell/shell_browser_main_parts.cc | 8 | ||||
| -rw-r--r-- | content/shell/shell_browser_main_parts.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index 954ce24..3c47011 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.cc @@ -80,8 +80,12 @@ ShellBrowserMainParts::ShellBrowserMainParts( : BrowserMainParts(), parameters_(parameters), run_message_loop_(true), - devtools_delegate_(NULL), - plugin_service_filter_(NULL) { + devtools_delegate_(NULL) +#if defined(ENABLE_PLUGINS) + , + plugin_service_filter_(NULL) +#endif +{ } ShellBrowserMainParts::~ShellBrowserMainParts() { diff --git a/content/shell/shell_browser_main_parts.h b/content/shell/shell_browser_main_parts.h index 49d5427..334ee03 100644 --- a/content/shell/shell_browser_main_parts.h +++ b/content/shell/shell_browser_main_parts.h @@ -49,7 +49,9 @@ class ShellBrowserMainParts : public BrowserMainParts { bool run_message_loop_; ShellDevToolsDelegate* devtools_delegate_; +#if defined(ENABLE_PLUGINS) scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_; +#endif DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); }; |