OLD | NEW |
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 "content/browser/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 #include "base/memory/memory_pressure_monitor_mac.h" | 102 #include "base/memory/memory_pressure_monitor_mac.h" |
103 #include "content/browser/bootstrap_sandbox_mac.h" | 103 #include "content/browser/bootstrap_sandbox_mac.h" |
104 #include "content/browser/browser_io_surface_manager_mac.h" | 104 #include "content/browser/browser_io_surface_manager_mac.h" |
105 #include "content/browser/cocoa/system_hotkey_helper_mac.h" | 105 #include "content/browser/cocoa/system_hotkey_helper_mac.h" |
106 #include "content/browser/compositor/browser_compositor_view_mac.h" | 106 #include "content/browser/compositor/browser_compositor_view_mac.h" |
107 #include "content/browser/in_process_io_surface_manager_mac.h" | 107 #include "content/browser/in_process_io_surface_manager_mac.h" |
108 #include "content/browser/theme_helper_mac.h" | 108 #include "content/browser/theme_helper_mac.h" |
109 #endif | 109 #endif |
110 | 110 |
111 #if defined(USE_OZONE) | 111 #if defined(USE_OZONE) |
112 #include "ui/ozone/public/client_native_pixmap_factory.h" | 112 #include "content/browser/gpu/browser_client_native_pixmap_factory_ozone.h" |
113 #endif | 113 #endif |
114 | 114 |
115 #if defined(OS_WIN) | 115 #if defined(OS_WIN) |
116 #include <windows.h> | 116 #include <windows.h> |
117 #include <commctrl.h> | 117 #include <commctrl.h> |
118 #include <shellapi.h> | 118 #include <shellapi.h> |
119 | 119 |
120 #include "base/memory/memory_pressure_monitor_win.h" | 120 #include "base/memory/memory_pressure_monitor_win.h" |
121 #include "content/browser/system_message_window_win.h" | 121 #include "content/browser/system_message_window_win.h" |
122 #include "content/common/sandbox_win.h" | 122 #include "content/common/sandbox_win.h" |
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
612 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:IOSurfaceManager"); | 612 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:IOSurfaceManager"); |
613 if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) { | 613 if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) { |
614 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance()); | 614 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance()); |
615 } else { | 615 } else { |
616 IOSurfaceManager::SetInstance(BrowserIOSurfaceManager::GetInstance()); | 616 IOSurfaceManager::SetInstance(BrowserIOSurfaceManager::GetInstance()); |
617 } | 617 } |
618 } | 618 } |
619 #endif | 619 #endif |
620 | 620 |
621 #if defined(USE_OZONE) | 621 #if defined(USE_OZONE) |
622 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); | |
623 ui::ClientNativePixmapFactory::SetInstance( | 622 ui::ClientNativePixmapFactory::SetInstance( |
624 client_native_pixmap_factory_.get()); | 623 BrowserClientNativePixmapFactory::GetInstance()); |
625 #endif | 624 #endif |
626 | 625 |
627 if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) { | 626 if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) { |
628 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver"); | 627 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver"); |
629 memory_observer_.reset(new MemoryObserver()); | 628 memory_observer_.reset(new MemoryObserver()); |
630 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get()); | 629 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get()); |
631 } | 630 } |
632 | 631 |
633 if (parsed_command_line_.HasSwitch( | 632 if (parsed_command_line_.HasSwitch( |
634 switches::kEnableAggressiveDOMStorageFlushing)) { | 633 switches::kEnableAggressiveDOMStorageFlushing)) { |
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1358 DCHECK(is_tracing_startup_); | 1357 DCHECK(is_tracing_startup_); |
1359 | 1358 |
1360 is_tracing_startup_ = false; | 1359 is_tracing_startup_ = false; |
1361 TracingController::GetInstance()->DisableRecording( | 1360 TracingController::GetInstance()->DisableRecording( |
1362 TracingController::CreateFileSink( | 1361 TracingController::CreateFileSink( |
1363 startup_trace_file_, | 1362 startup_trace_file_, |
1364 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1363 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
1365 } | 1364 } |
1366 | 1365 |
1367 } // namespace content | 1366 } // namespace content |
OLD | NEW |