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

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

Issue 367002: Added Pepper 3D render context that instantiates the GPU plugin.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years 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.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #include "app/hi_res_timer_manager.h" 7 #include "app/hi_res_timer_manager.h"
8 #include "app/system_monitor.h" 8 #include "app/system_monitor.h"
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include "app/win_util.h" 10 #include "app/win_util.h"
11 #endif 11 #endif
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 "chrome/common/child_process.h" 15 #include "chrome/common/child_process.h"
16 #include "chrome/common/chrome_constants.h" 16 #include "chrome/common/chrome_constants.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/gpu_plugin.h"
18 #include "chrome/common/logging_chrome.h" 19 #include "chrome/common/logging_chrome.h"
19 #include "chrome/common/main_function_params.h" 20 #include "chrome/common/main_function_params.h"
20 #include "chrome/plugin/plugin_thread.h" 21 #include "chrome/plugin/plugin_thread.h"
21 22
22 #if defined(OS_WIN) 23 #if defined(OS_WIN)
23 #include "chrome/test/injection_test_dll.h" 24 #include "chrome/test/injection_test_dll.h"
24 #include "sandbox/src/sandbox.h" 25 #include "sandbox/src/sandbox.h"
25 #elif defined(OS_LINUX) 26 #elif defined(OS_LINUX)
26 #include "base/global_descriptors_posix.h" 27 #include "base/global_descriptors_posix.h"
27 #include "ipc/ipc_descriptors.h" 28 #include "ipc/ipc_descriptors.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 DCHECK(result) << "Test number " << test_count << " has failed."; 106 DCHECK(result) << "Test number " << test_count << " has failed.";
106 // If we are in release mode, crash or debug the process. 107 // If we are in release mode, crash or debug the process.
107 if (!result) 108 if (!result)
108 __debugbreak(); 109 __debugbreak();
109 } 110 }
110 111
111 FreeLibrary(sandbox_test_module); 112 FreeLibrary(sandbox_test_module);
112 } 113 }
113 #endif 114 #endif
114 115
116 chrome::RegisterInternalGPUPlugin();
117
115 MessageLoop::current()->Run(); 118 MessageLoop::current()->Run();
116 } 119 }
117 120
118 #if defined(OS_WIN) 121 #if defined(OS_WIN)
119 CoUninitialize(); 122 CoUninitialize();
120 #endif 123 #endif
121 124
122 return 0; 125 return 0;
123 } 126 }
OLDNEW
« no previous file with comments | « chrome/plugin/command_buffer_stub.cc ('k') | chrome/plugin/webplugin_delegate_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698