summaryrefslogtreecommitdiffstats
path: root/content/ppapi_plugin
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 20:53:09 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 20:53:09 +0000
commita3638bbe6364eed17f7d03bf89b504ba34d63038 (patch)
treed7662f1ef60211056fbad1cc17b9d68cf16d4797 /content/ppapi_plugin
parent5714e775d97d11eba077ce7d17b4203f279546a9 (diff)
downloadchromium_src-a3638bbe6364eed17f7d03bf89b504ba34d63038.zip
chromium_src-a3638bbe6364eed17f7d03bf89b504ba34d63038.tar.gz
chromium_src-a3638bbe6364eed17f7d03bf89b504ba34d63038.tar.bz2
mac: Remove InitWebCoreSystemInterface() calls from many random places.
This is now done at the webkit api layer (https://bugs.webkit.org/show_bug.cgi?id=78246), so clients no longer have to explicitly do this. Fixes 2 TODOs, helps with the mac component build, and removes a direct WebCore dependency from client code. BUG=90078 TEST=none TBR=tony,brettw Review URL: http://codereview.chromium.org/9374020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
-rw-r--r--content/ppapi_plugin/ppapi_plugin_main.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
index 1b0d2ee..36707ca 100644
--- a/content/ppapi_plugin/ppapi_plugin_main.cc
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -17,10 +17,6 @@
#include "sandbox/src/sandbox.h"
#endif
-#if defined(OS_MACOSX)
-#include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
-#endif
-
#if defined(OS_WIN)
sandbox::TargetServices* g_target_services = NULL;
#else
@@ -45,12 +41,6 @@ int PpapiPluginMain(const content::MainFunctionParams& parameters) {
ChildProcess::WaitForDebugger("Ppapi");
}
-#if defined(OS_MACOSX)
- // TODO(viettrungluu): This is called in different places in processes that
- // will run WebKit. This is stupid and error-prone.
- InitWebCoreSystemInterface();
-#endif
-
MessageLoop main_message_loop;
base::PlatformThread::SetName("CrPPAPIMain");