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

Side by Side Diff: chrome/browser/android/vr_shell/ui_scene_manager.cc

Issue 2906423002: [vr] Migrate from vr::Colorf to SkColor (Closed)
Patch Set: Created 3 years, 6 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "chrome/browser/android/vr_shell/ui_scene_manager.h" 5 #include "chrome/browser/android/vr_shell/ui_scene_manager.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "chrome/browser/android/vr_shell/color_scheme.h" 9 #include "chrome/browser/android/vr_shell/color_scheme.h"
10 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h" 10 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 -kBackgroundDistanceMultiplier); 354 -kBackgroundDistanceMultiplier);
355 } 355 }
356 356
357 void UiSceneManager::UpdateBackgroundColor() { 357 void UiSceneManager::UpdateBackgroundColor() {
358 scene_->SetBackgroundColor(color_scheme().horizon); 358 scene_->SetBackgroundColor(color_scheme().horizon);
359 ceiling_->set_center_color(color_scheme().ceiling); 359 ceiling_->set_center_color(color_scheme().ceiling);
360 ceiling_->set_edge_color(color_scheme().horizon); 360 ceiling_->set_edge_color(color_scheme().horizon);
361 floor_->set_center_color(color_scheme().floor); 361 floor_->set_center_color(color_scheme().floor);
362 floor_->set_edge_color(color_scheme().horizon); 362 floor_->set_edge_color(color_scheme().horizon);
363 floor_grid_->set_center_color(color_scheme().floor_grid); 363 floor_grid_->set_center_color(color_scheme().floor_grid);
364 vr::Colorf floor_grid_edge_color = color_scheme().floor_grid; 364 SkColor floor_grid_edge_color = SkColorSetA(color_scheme().floor_grid, 0);
365 floor_grid_edge_color.a = 0.0;
366 floor_grid_->set_edge_color(floor_grid_edge_color); 365 floor_grid_->set_edge_color(floor_grid_edge_color);
367 } 366 }
368 367
369 void UiSceneManager::SetAudioCapturingIndicator(bool enabled) { 368 void UiSceneManager::SetAudioCapturingIndicator(bool enabled) {
370 audio_capture_indicator_->set_visible(enabled); 369 audio_capture_indicator_->set_visible(enabled);
371 } 370 }
372 371
373 void UiSceneManager::SetVideoCapturingIndicator(bool enabled) { 372 void UiSceneManager::SetVideoCapturingIndicator(bool enabled) {
374 video_capture_indicator_->set_visible(enabled); 373 video_capture_indicator_->set_visible(enabled);
375 } 374 }
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 int UiSceneManager::AllocateId() { 452 int UiSceneManager::AllocateId() {
454 return next_available_id_++; 453 return next_available_id_++;
455 } 454 }
456 455
457 const ColorScheme& UiSceneManager::color_scheme() const { 456 const ColorScheme& UiSceneManager::color_scheme() const {
458 return ColorScheme::GetColorScheme(fullscreen_ ? ColorScheme::kModeFullscreen 457 return ColorScheme::GetColorScheme(fullscreen_ ? ColorScheme::kModeFullscreen
459 : ColorScheme::kModeNormal); 458 : ColorScheme::kModeNormal);
460 } 459 }
461 460
462 } // namespace vr_shell 461 } // namespace vr_shell
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/ui_scene.cc ('k') | chrome/browser/android/vr_shell/ui_scene_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698