diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 09:42:34 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 09:42:34 +0000 |
| commit | dfb9360194444524a23124372452607162647235 (patch) | |
| tree | 16442bd9d105074a5fdf79e144cee8a83d1650fe /content | |
| parent | 7886b628ef65e7bd087d1cee2c72c43e38763699 (diff) | |
| download | chromium_src-dfb9360194444524a23124372452607162647235.zip chromium_src-dfb9360194444524a23124372452607162647235.tar.gz chromium_src-dfb9360194444524a23124372452607162647235.tar.bz2 | |
Build fix for enable_plugins=0
TBR=marja@chromium.org
Review URL: https://codereview.chromium.org/16095003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_shell.gypi | 6 | ||||
| -rw-r--r-- | content/shell/shell_browser_main_parts.cc | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 7ae3520..e0bb675 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -231,6 +231,12 @@ '../third_party/freetype2/freetype2.gyp:freetype2', ], }], + ['enable_plugins==0', { + 'sources/': [ + ['exclude', 'shell/shell_plugin_service_filter.cc'], + ['exclude', 'shell/shell_plugin_service_filter.h'], + ], + }] ], }, { diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index acf0a13..954ce24 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.cc @@ -11,7 +11,6 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "cc/base/switches.h" -#include "content/public/browser/plugin_service.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #include "content/public/common/url_constants.h" @@ -19,13 +18,17 @@ #include "content/shell/shell.h" #include "content/shell/shell_browser_context.h" #include "content/shell/shell_devtools_delegate.h" -#include "content/shell/shell_plugin_service_filter.h" #include "googleurl/src/gurl.h" #include "grit/net_resources.h" #include "net/base/net_module.h" #include "net/base/net_util.h" #include "ui/base/resource/resource_bundle.h" +#if defined(ENABLE_PLUGINS) +#include "content/public/browser/plugin_service.h" +#include "content/shell/shell_plugin_service_filter.h" +#endif + #if defined(OS_ANDROID) #include "net/android/network_change_notifier_factory_android.h" #include "net/base/network_change_notifier.h" @@ -123,11 +126,15 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { NULL, MSG_ROUTING_NONE, gfx::Size()); - } else { + } + +#if defined(ENABLE_PLUGINS) + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { PluginService* plugin_service = PluginService::GetInstance(); plugin_service_filter_.reset(new ShellPluginServiceFilter); plugin_service->SetFilter(plugin_service_filter_.get()); } +#endif if (parameters_.ui_task) { parameters_.ui_task->Run(); |