| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <windows.h> | 8 #include <windows.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| 11 #include "app/win/scoped_com_initializer.h" | 11 #include "app/win/scoped_com_initializer.h" |
| 12 #include "base/environment.h" | 12 #include "base/environment.h" |
| 13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
| 14 #include "base/stringprintf.h" | 14 #include "base/stringprintf.h" |
| 15 #include "base/threading/platform_thread.h" | 15 #include "base/threading/platform_thread.h" |
| 16 #include "build/build_config.h" | 16 #include "build/build_config.h" |
| 17 #include "content/common/content_switches.h" | 17 #include "content/common/content_switches.h" |
| 18 #include "content/common/main_function_params.h" | 18 #include "content/common/main_function_params.h" |
| 19 #include "chrome/gpu/gpu_config.h" | 19 #include "content/gpu/gpu_config.h" |
| 20 #include "chrome/gpu/gpu_process.h" | 20 #include "content/gpu/gpu_process.h" |
| 21 #include "chrome/gpu/gpu_thread.h" | 21 #include "content/gpu/gpu_thread.h" |
| 22 | 22 |
| 23 #if defined(OS_MACOSX) | 23 #if defined(OS_MACOSX) |
| 24 #include "content/common/chrome_application_mac.h" | 24 #include "content/common/chrome_application_mac.h" |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 #if defined(USE_X11) | 27 #if defined(USE_X11) |
| 28 #include "ui/base/x/x11_util.h" | 28 #include "ui/base/x/x11_util.h" |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 // Main function for starting the Gpu process. | 31 // Main function for starting the Gpu process. |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 gpu_thread->Init(start_time); | 78 gpu_thread->Init(start_time); |
| 79 | 79 |
| 80 gpu_process.set_main_thread(gpu_thread); | 80 gpu_process.set_main_thread(gpu_thread); |
| 81 | 81 |
| 82 main_message_loop.Run(); | 82 main_message_loop.Run(); |
| 83 | 83 |
| 84 gpu_thread->StopWatchdog(); | 84 gpu_thread->StopWatchdog(); |
| 85 | 85 |
| 86 return 0; | 86 return 0; |
| 87 } | 87 } |
| OLD | NEW |