content/plugin/plugin_main.cc - Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/plugin/plugin_main.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: content/plugin/plugin_main.cc

diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc

index 63dc5f9226d20256a932b32d53e3d5cda59219be..bcf8856561e6a04da0e6d9089d1c15f2a3e94253 100644

--- a/content/plugin/plugin_main.cc

+++ b/content/plugin/plugin_main.cc

@@ -38,9 +38,6 @@ void TrimInterposeEnvironment();

// Initializes the global Cocoa application object.

void InitializeChromeApplication();

-#elif defined(OS_LINUX)

-// Work around an unimplemented instruction in 64-bit Flash.

-void WorkaroundFlashLAHF();

#endif

// main() routine for running as the plugin process.

@@ -60,13 +57,7 @@ int PluginMain(const MainFunctionParams& parameters) {

const CommandLine& parsed_command_line = parameters.command_line;

-#if defined(OS_LINUX)

-#if defined(ARCH_CPU_64_BITS)

- WorkaroundFlashLAHF();

-#endif

-#elif defined(OS_WIN)

+#if defined(OS_WIN)

base::win::ScopedCOMInitializer com_initializer;

#endif

« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/plugin/plugin_main_linux.cc » ('j') | no next file with comments »