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

Side by Side Diff: chrome/renderer/renderer_main.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
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 #if defined(OS_MACOSX) 5 #if defined(OS_MACOSX)
6 #include <signal.h> 6 #include <signal.h>
7 #include <unistd.h> 7 #include <unistd.h>
8 #endif // OS_MACOSX 8 #endif // OS_MACOSX
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/gfx_resource_provider.h" 24 #include "chrome/common/gfx_resource_provider.h"
25 #include "chrome/common/hi_res_timer_manager.h" 25 #include "chrome/common/hi_res_timer_manager.h"
26 #include "chrome/common/logging_chrome.h" 26 #include "chrome/common/logging_chrome.h"
27 #include "chrome/common/main_function_params.h" 27 #include "chrome/common/main_function_params.h"
28 #include "chrome/common/net/net_resource_provider.h" 28 #include "chrome/common/net/net_resource_provider.h"
29 #include "chrome/common/pepper_plugin_registry.h" 29 #include "chrome/common/pepper_plugin_registry.h"
30 #include "chrome/renderer/renderer_main_platform_delegate.h" 30 #include "chrome/renderer/renderer_main_platform_delegate.h"
31 #include "chrome/renderer/render_process_impl.h" 31 #include "chrome/renderer/render_process_impl.h"
32 #include "chrome/renderer/render_thread.h" 32 #include "chrome/renderer/render_thread.h"
33 #include "gfx/gfx_module.h"
34 #include "grit/generated_resources.h" 33 #include "grit/generated_resources.h"
35 #include "net/base/net_module.h" 34 #include "net/base/net_module.h"
36 #include "ui/base/system_monitor/system_monitor.h" 35 #include "ui/base/system_monitor/system_monitor.h"
36 #include "ui/gfx/gfx_module.h"
37 37
38 #if defined(OS_MACOSX) 38 #if defined(OS_MACOSX)
39 #include "base/eintr_wrapper.h" 39 #include "base/eintr_wrapper.h"
40 #include "chrome/app/breakpad_mac.h" 40 #include "chrome/app/breakpad_mac.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
42 #endif // OS_MACOSX 42 #endif // OS_MACOSX
43 43
44 #if defined(USE_LINUX_BREAKPAD) 44 #if defined(USE_LINUX_BREAKPAD)
45 #include "chrome/app/breakpad_linux.h" 45 #include "chrome/app/breakpad_linux.h"
46 #endif 46 #endif
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 pool->Recycle(); 298 pool->Recycle();
299 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0); 299 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0);
300 MessageLoop::current()->Run(); 300 MessageLoop::current()->Run();
301 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0); 301 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0);
302 } 302 }
303 } 303 }
304 platform.PlatformUninitialize(); 304 platform.PlatformUninitialize();
305 TRACE_EVENT_END("RendererMain", 0, ""); 305 TRACE_EVENT_END("RendererMain", 0, "");
306 return 0; 306 return 0;
307 } 307 }
OLDNEW
« no previous file with comments | « chrome/renderer/render_widget_browsertest.cc ('k') | chrome/renderer/renderer_main_platform_delegate_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698