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

Side by Side Diff: chrome/plugin/plugin_main.cc

Issue 6588090: Removed GPU plugin.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 | « chrome/plugin/command_buffer_stub_win.cc ('k') | chrome/plugin/webplugin_delegate_stub.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <objbase.h> 8 #include <objbase.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/threading/platform_thread.h" 15 #include "base/threading/platform_thread.h"
16 #include "chrome/common/child_process.h" 16 #include "chrome/common/child_process.h"
17 #include "chrome/common/chrome_constants.h" 17 #include "chrome/common/chrome_constants.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/default_plugin.h" 19 #include "chrome/common/default_plugin.h"
20 #include "chrome/common/gpu_plugin.h"
21 #include "chrome/common/hi_res_timer_manager.h" 20 #include "chrome/common/hi_res_timer_manager.h"
22 #include "chrome/common/logging_chrome.h" 21 #include "chrome/common/logging_chrome.h"
23 #include "chrome/common/main_function_params.h" 22 #include "chrome/common/main_function_params.h"
24 #include "chrome/plugin/plugin_thread.h" 23 #include "chrome/plugin/plugin_thread.h"
25 #include "ui/base/system_monitor/system_monitor.h" 24 #include "ui/base/system_monitor/system_monitor.h"
26 25
27 #if defined(OS_WIN) 26 #if defined(OS_WIN)
28 #include "chrome/test/injection_test_dll.h" 27 #include "chrome/test/injection_test_dll.h"
29 #include "sandbox/src/sandbox.h" 28 #include "sandbox/src/sandbox.h"
30 #elif defined(OS_POSIX) && !defined(OS_MACOSX) 29 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 __debugbreak(); 166 __debugbreak();
168 _exit(1); 167 _exit(1);
169 } 168 }
170 } 169 }
171 170
172 FreeLibrary(sandbox_test_module); 171 FreeLibrary(sandbox_test_module);
173 } 172 }
174 #endif 173 #endif
175 174
176 chrome::RegisterInternalDefaultPlugin(); 175 chrome::RegisterInternalDefaultPlugin();
177 chrome::RegisterInternalGPUPlugin();
178 176
179 MessageLoop::current()->Run(); 177 MessageLoop::current()->Run();
180 } 178 }
181 179
182 #if defined(OS_WIN) 180 #if defined(OS_WIN)
183 CoUninitialize(); 181 CoUninitialize();
184 #endif 182 #endif
185 183
186 return 0; 184 return 0;
187 } 185 }
OLDNEW
« no previous file with comments | « chrome/plugin/command_buffer_stub_win.cc ('k') | chrome/plugin/webplugin_delegate_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698