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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 2485623002: discardable_memory: Using mojo IPC to replace Chrome IPC (Closed)
Patch Set: Fix bot issues Created 4 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
OLDNEW
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 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 { 627 {
628 base::SetRecordActionTaskRunner( 628 base::SetRecordActionTaskRunner(
629 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)); 629 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI));
630 } 630 }
631 631
632 #if defined(OS_WIN) 632 #if defined(OS_WIN)
633 if (base::win::GetVersion() >= base::win::VERSION_WIN8) 633 if (base::win::GetVersion() >= base::win::VERSION_WIN8)
634 screen_orientation_delegate_.reset(new ScreenOrientationDelegateWin()); 634 screen_orientation_delegate_.reset(new ScreenOrientationDelegateWin());
635 #endif 635 #endif
636 636
637 auto* discardable_shared_memory_manager =
638 discardable_memory::DiscardableSharedMemoryManager::CreateInstance();
639
637 // TODO(boliu): kSingleProcess check is a temporary workaround for 640 // TODO(boliu): kSingleProcess check is a temporary workaround for
638 // in-process Android WebView. crbug.com/503724 tracks proper fix. 641 // in-process Android WebView. crbug.com/503724 tracks proper fix.
639 if (!parsed_command_line_.HasSwitch(switches::kSingleProcess)) { 642 if (!parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
640 base::DiscardableMemoryAllocator::SetInstance( 643 base::DiscardableMemoryAllocator::SetInstance(
641 discardable_memory::DiscardableSharedMemoryManager::current()); 644 discardable_shared_memory_manager);
642 } 645 }
643 646
644 if (parts_) 647 if (parts_)
645 parts_->PostMainMessageLoopStart(); 648 parts_->PostMainMessageLoopStart();
646 649
647 // Start startup tracing through TracingController's interface. TraceLog has 650 // Start startup tracing through TracingController's interface. TraceLog has
648 // been enabled in content_main_runner where threads are not available. Now We 651 // been enabled in content_main_runner where threads are not available. Now We
649 // need to start tracing for all other tracing agents, which require threads. 652 // need to start tracing for all other tracing agents, which require threads.
650 if (parsed_command_line_.HasSwitch(switches::kTraceStartup)) { 653 if (parsed_command_line_.HasSwitch(switches::kTraceStartup)) {
651 base::trace_event::TraceConfig trace_config( 654 base::trace_event::TraceConfig trace_config(
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1626 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1629 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1627 audio_thread_->task_runner(); 1630 audio_thread_->task_runner();
1628 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1631 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1629 std::move(worker_task_runner), 1632 std::move(worker_task_runner),
1630 MediaInternals::GetInstance()); 1633 MediaInternals::GetInstance());
1631 } 1634 }
1632 CHECK(audio_manager_); 1635 CHECK(audio_manager_);
1633 } 1636 }
1634 1637
1635 } // namespace content 1638 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698