Chromium Code Reviews| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 122 #include "ui/ozone/public/client_native_pixmap_factory.h" | 122 #include "ui/ozone/public/client_native_pixmap_factory.h" |
| 123 #include "ui/ozone/public/ozone_platform.h" | 123 #include "ui/ozone/public/ozone_platform.h" |
| 124 #endif | 124 #endif |
| 125 | 125 |
| 126 #if defined(OS_WIN) | 126 #if defined(OS_WIN) |
| 127 #include <windows.h> | 127 #include <windows.h> |
| 128 #include <commctrl.h> | 128 #include <commctrl.h> |
| 129 #include <shellapi.h> | 129 #include <shellapi.h> |
| 130 | 130 |
| 131 #include "base/memory/memory_pressure_monitor_win.h" | 131 #include "base/memory/memory_pressure_monitor_win.h" |
| 132 #include "base/win/windows_version.h" | |
| 133 #include "content/browser/screen_orientation/screen_orientation_delegate_win.h" | |
| 132 #include "content/browser/system_message_window_win.h" | 134 #include "content/browser/system_message_window_win.h" |
| 133 #include "content/common/sandbox_win.h" | 135 #include "content/common/sandbox_win.h" |
| 134 #include "net/base/winsock_init.h" | 136 #include "net/base/winsock_init.h" |
| 135 #include "ui/base/l10n/l10n_util_win.h" | 137 #include "ui/base/l10n/l10n_util_win.h" |
| 136 #endif | 138 #endif |
| 137 | 139 |
| 138 #if defined(OS_CHROMEOS) | 140 #if defined(OS_CHROMEOS) |
| 139 #include "base/memory/memory_pressure_monitor_chromeos.h" | 141 #include "base/memory/memory_pressure_monitor_chromeos.h" |
| 140 #include "chromeos/chromeos_switches.h" | 142 #include "chromeos/chromeos_switches.h" |
| 141 #endif | 143 #endif |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 587 | 589 |
| 588 { | 590 { |
| 589 system_stats_monitor_.reset( | 591 system_stats_monitor_.reset( |
| 590 new base::trace_event::TraceEventSystemStatsMonitor( | 592 new base::trace_event::TraceEventSystemStatsMonitor( |
| 591 base::ThreadTaskRunnerHandle::Get())); | 593 base::ThreadTaskRunnerHandle::Get())); |
| 592 } | 594 } |
| 593 #endif // !defined(OS_IOS) | 595 #endif // !defined(OS_IOS) |
| 594 | 596 |
| 595 #if defined(OS_WIN) | 597 #if defined(OS_WIN) |
| 596 system_message_window_.reset(new SystemMessageWindowWin); | 598 system_message_window_.reset(new SystemMessageWindowWin); |
| 599 if (base::win::GetVersion() >= base::win::VERSION_WIN8) | |
| 600 screen_orientation_delegate_.reset(new ScreenOrientationDelegateWin()); | |
|
cpu_(ooo_6.6-7.5)
2016/03/11 02:12:01
can this be later? like in PostMainMessageLoopStar
aleksandar.stojiljkovic
2016/03/11 19:29:26
Don't know.
Same thing for Android is in this meth
| |
| 597 #endif | 601 #endif |
| 598 | 602 |
| 599 // TODO(boliu): kSingleProcess check is a temporary workaround for | 603 // TODO(boliu): kSingleProcess check is a temporary workaround for |
| 600 // in-process Android WebView. crbug.com/503724 tracks proper fix. | 604 // in-process Android WebView. crbug.com/503724 tracks proper fix. |
| 601 if (!parsed_command_line_.HasSwitch(switches::kSingleProcess)) { | 605 if (!parsed_command_line_.HasSwitch(switches::kSingleProcess)) { |
| 602 base::DiscardableMemoryAllocator::SetInstance( | 606 base::DiscardableMemoryAllocator::SetInstance( |
| 603 HostDiscardableSharedMemoryManager::current()); | 607 HostDiscardableSharedMemoryManager::current()); |
| 604 } | 608 } |
| 605 | 609 |
| 606 if (parts_) | 610 if (parts_) |
| (...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1470 DCHECK(is_tracing_startup_for_duration_); | 1474 DCHECK(is_tracing_startup_for_duration_); |
| 1471 | 1475 |
| 1472 is_tracing_startup_for_duration_ = false; | 1476 is_tracing_startup_for_duration_ = false; |
| 1473 TracingController::GetInstance()->StopTracing( | 1477 TracingController::GetInstance()->StopTracing( |
| 1474 TracingController::CreateFileSink( | 1478 TracingController::CreateFileSink( |
| 1475 startup_trace_file_, | 1479 startup_trace_file_, |
| 1476 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1480 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
| 1477 } | 1481 } |
| 1478 | 1482 |
| 1479 } // namespace content | 1483 } // namespace content |
| OLD | NEW |