OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chromecast/browser/cast_browser_main_parts.h" | 5 #include "chromecast/browser/cast_browser_main_parts.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <string.h> | 8 #include <string.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 // AudioManagerFactory to be set beforehand. | 319 // AudioManagerFactory to be set beforehand. |
320 ::media::AudioManager::SetFactory(new media::CastAudioManagerFactory()); | 320 ::media::AudioManager::SetFactory(new media::CastAudioManagerFactory()); |
321 #endif | 321 #endif |
322 | 322 |
323 #if defined(USE_AURA) | 323 #if defined(USE_AURA) |
324 // Screen can (and should) exist even with no displays connected. Its presence | 324 // Screen can (and should) exist even with no displays connected. Its presence |
325 // is assumed as an interface to access display information, e.g. from metrics | 325 // is assumed as an interface to access display information, e.g. from metrics |
326 // code. See CastContentWindow::CreateWindowTree for update when resolution | 326 // code. See CastContentWindow::CreateWindowTree for update when resolution |
327 // is available. | 327 // is available. |
328 cast_browser_process_->SetCastScreen(make_scoped_ptr(new CastScreen)); | 328 cast_browser_process_->SetCastScreen(make_scoped_ptr(new CastScreen)); |
329 DCHECK(!gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE)); | 329 DCHECK(!gfx::Screen::GetScreen()); |
330 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, | 330 gfx::Screen::SetScreenInstance(cast_browser_process_->cast_screen()); |
331 cast_browser_process_->cast_screen()); | |
332 #endif | 331 #endif |
333 | 332 |
334 content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 333 content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
335 kChromeResourceScheme); | 334 kChromeResourceScheme); |
336 return 0; | 335 return 0; |
337 } | 336 } |
338 | 337 |
339 void CastBrowserMainParts::PreMainMessageLoopRun() { | 338 void CastBrowserMainParts::PreMainMessageLoopRun() { |
340 #if !defined(OS_ANDROID) | 339 #if !defined(OS_ANDROID) |
341 // Set GL strings so GPU config code can make correct feature blacklisting/ | 340 // Set GL strings so GPU config code can make correct feature blacklisting/ |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 #if defined(USE_AURA) | 451 #if defined(USE_AURA) |
453 aura::Env::DeleteInstance(); | 452 aura::Env::DeleteInstance(); |
454 #endif | 453 #endif |
455 | 454 |
456 DeregisterKillOnAlarm(); | 455 DeregisterKillOnAlarm(); |
457 #endif | 456 #endif |
458 } | 457 } |
459 | 458 |
460 } // namespace shell | 459 } // namespace shell |
461 } // namespace chromecast | 460 } // namespace chromecast |
OLD | NEW |