Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Side by Side Diff: content/gpu/gpu_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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_tests.gypi ('k') | content/plugin/plugin_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdlib.h> 5 #include <stdlib.h>
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <dwmapi.h> 8 #include <dwmapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 base::MessageLoop::Type message_loop_type = base::MessageLoop::TYPE_IO; 132 base::MessageLoop::Type message_loop_type = base::MessageLoop::TYPE_IO;
133 #if defined(OS_WIN) 133 #if defined(OS_WIN)
134 // Unless we're running on desktop GL, we don't need a UI message 134 // Unless we're running on desktop GL, we don't need a UI message
135 // loop, so avoid its use to work around apparent problems with some 135 // loop, so avoid its use to work around apparent problems with some
136 // third-party software. 136 // third-party software.
137 if (command_line.HasSwitch(switches::kUseGL) && 137 if (command_line.HasSwitch(switches::kUseGL) &&
138 command_line.GetSwitchValueASCII(switches::kUseGL) == 138 command_line.GetSwitchValueASCII(switches::kUseGL) ==
139 gfx::kGLImplementationDesktopName) { 139 gfx::kGLImplementationDesktopName) {
140 message_loop_type = base::MessageLoop::TYPE_UI; 140 message_loop_type = base::MessageLoop::TYPE_UI;
141 } 141 }
142 #elif defined(TOOLKIT_GTK)
143 message_loop_type = base::MessageLoop::TYPE_GPU;
144 #elif defined(OS_LINUX) 142 #elif defined(OS_LINUX)
145 message_loop_type = base::MessageLoop::TYPE_DEFAULT; 143 message_loop_type = base::MessageLoop::TYPE_DEFAULT;
146 #endif 144 #endif
147 145
148 base::MessageLoop main_message_loop(message_loop_type); 146 base::MessageLoop main_message_loop(message_loop_type);
149 base::PlatformThread::SetName("CrGpuMain"); 147 base::PlatformThread::SetName("CrGpuMain");
150 148
151 // In addition to disabling the watchdog if the command line switch is 149 // In addition to disabling the watchdog if the command line switch is
152 // present, disable the watchdog on valgrind because the code is expected 150 // present, disable the watchdog on valgrind because the code is expected
153 // to run slowly in that case. 151 // to run slowly in that case.
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 return true; 450 return true;
453 } 451 }
454 452
455 return false; 453 return false;
456 } 454 }
457 #endif // defined(OS_WIN) 455 #endif // defined(OS_WIN)
458 456
459 } // namespace. 457 } // namespace.
460 458
461 } // namespace content 459 } // namespace content
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/plugin/plugin_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698