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

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

Issue 2326933002: MacViews: Fix gn check fail for mac_views_browser on Aura dependencies. (Closed)
Patch Set: Typo. Created 4 years, 3 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
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 #include "skia/ext/skia_memory_dump_provider.h" 92 #include "skia/ext/skia_memory_dump_provider.h"
93 #include "sql/sql_memory_dump_provider.h" 93 #include "sql/sql_memory_dump_provider.h"
94 #include "ui/base/clipboard/clipboard.h" 94 #include "ui/base/clipboard/clipboard.h"
95 95
96 #if defined(USE_AURA) || defined(OS_MACOSX) 96 #if defined(USE_AURA) || defined(OS_MACOSX)
97 #include "content/browser/compositor/image_transport_factory.h" 97 #include "content/browser/compositor/image_transport_factory.h"
98 #endif 98 #endif
99 99
100 #if defined(USE_AURA) 100 #if defined(USE_AURA)
101 #include "content/public/browser/context_factory.h" 101 #include "content/public/browser/context_factory.h"
102 #include "ui/aura/env.h" 102 #include "ui/aura/env.h" // nogncheck
103 #endif 103 #endif
104 104
105 #if defined(OS_ANDROID) 105 #if defined(OS_ANDROID)
106 #include "base/android/jni_android.h" 106 #include "base/android/jni_android.h"
107 #include "components/tracing/common/graphics_memory_dump_provider_android.h" 107 #include "components/tracing/common/graphics_memory_dump_provider_android.h"
108 #include "content/browser/android/browser_startup_controller.h" 108 #include "content/browser/android/browser_startup_controller.h"
109 #include "content/browser/android/browser_surface_texture_manager.h" 109 #include "content/browser/android/browser_surface_texture_manager.h"
110 #include "content/browser/android/tracing_controller_android.h" 110 #include "content/browser/android/tracing_controller_android.h"
111 #include "content/browser/media/android/browser_media_player_manager.h" 111 #include "content/browser/media/android/browser_media_player_manager.h"
112 #include "content/browser/renderer_host/context_provider_factory_impl_android.h" 112 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
(...skipping 1427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1540 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1540 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1541 audio_thread_->task_runner(); 1541 audio_thread_->task_runner();
1542 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1542 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1543 std::move(worker_task_runner), 1543 std::move(worker_task_runner),
1544 MediaInternals::GetInstance()); 1544 MediaInternals::GetInstance());
1545 } 1545 }
1546 CHECK(audio_manager_); 1546 CHECK(audio_manager_);
1547 } 1547 }
1548 1548
1549 } // namespace content 1549 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698