diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 02:56:55 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 02:56:55 +0000 |
| commit | ebd71961746ee354fee968c28870725408ce286b (patch) | |
| tree | de0eefa559772dd9016cdc6a989a6103b3282b7a /content/browser/browser_main_loop.cc | |
| parent | 0721ee05d1ed63a1076cf77d0c19dab8336ad9cd (diff) | |
| download | chromium_src-ebd71961746ee354fee968c28870725408ce286b.zip chromium_src-ebd71961746ee354fee968c28870725408ce286b.tar.gz chromium_src-ebd71961746ee354fee968c28870725408ce286b.tar.bz2 | |
Exclude PluginService for builds with enable_plugins==0
- Saves 140k in the final shared library (libchromeview.so)
- Fixes all plugin related link errors during component build of
content_shell_apk
BUG=158821, 162667
Review URL: https://chromiumcodereview.appspot.com/11615002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index fd98057..84a9622 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -352,13 +352,15 @@ void BrowserMainLoop::MainMessageLoopStart() { } online_state_observer_.reset(new BrowserOnlineStateObserver); +#endif // !defined(OS_IOS) +#if defined(ENABLE_PLUGINS) // Prior to any processing happening on the io thread, we create the // plugin service as it is predominantly used from the io thread, // but must be created on the main thread. The service ctor is // inexpensive and does not invoke the io_thread() accessor. PluginService::GetInstance()->Init(); -#endif // !defined(OS_IOS) +#endif #if defined(OS_WIN) system_message_window_.reset(new SystemMessageWindowWin); |