| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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.h" | 5 #include "chrome/browser/android/vr_shell/ui_scene.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 | 181 |
| 182 mode_ = mode; | 182 mode_ = mode; |
| 183 for (const auto& element : ui_elements_) | 183 for (const auto& element : ui_elements_) |
| 184 element->SetMode(mode); | 184 element->SetMode(mode); |
| 185 } | 185 } |
| 186 | 186 |
| 187 ColorScheme::Mode UiScene::mode() const { | 187 ColorScheme::Mode UiScene::mode() const { |
| 188 return mode_; | 188 return mode_; |
| 189 } | 189 } |
| 190 | 190 |
| 191 SkColor UiScene::GetBackgroundColor() const { | 191 SkColor UiScene::GetWorldBackgroundColor() const { |
| 192 return ColorScheme::GetColorScheme(mode_).horizon; | 192 return ColorScheme::GetColorScheme(mode_).world_background; |
| 193 } | 193 } |
| 194 | 194 |
| 195 void UiScene::SetBackgroundDistance(float distance) { | 195 void UiScene::SetBackgroundDistance(float distance) { |
| 196 background_distance_ = distance; | 196 background_distance_ = distance; |
| 197 } | 197 } |
| 198 | 198 |
| 199 float UiScene::GetBackgroundDistance() const { | 199 float UiScene::GetBackgroundDistance() const { |
| 200 return background_distance_; | 200 return background_distance_; |
| 201 } | 201 } |
| 202 | 202 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 | 262 |
| 263 // TODO(mthiesse): Move this to UiSceneManager. | 263 // TODO(mthiesse): Move this to UiSceneManager. |
| 264 void UiScene::OnGLInitialized() { | 264 void UiScene::OnGLInitialized() { |
| 265 gl_initialized_ = true; | 265 gl_initialized_ = true; |
| 266 for (auto& element : ui_elements_) { | 266 for (auto& element : ui_elements_) { |
| 267 element->Initialize(); | 267 element->Initialize(); |
| 268 } | 268 } |
| 269 } | 269 } |
| 270 | 270 |
| 271 } // namespace vr_shell | 271 } // namespace vr_shell |
| OLD | NEW |