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

Side by Side Diff: chrome/browser/android/vr_shell/ui_scene.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 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 elements.push_back(element.get()); 168 elements.push_back(element.get());
169 } 169 }
170 } 170 }
171 return elements; 171 return elements;
172 } 172 }
173 173
174 bool UiScene::HasVisibleHeadLockedElements() const { 174 bool UiScene::HasVisibleHeadLockedElements() const {
175 return !GetHeadLockedElements().empty(); 175 return !GetHeadLockedElements().empty();
176 } 176 }
177 177
178 void UiScene::SetBackgroundColor(const vr::Colorf& color) { 178 void UiScene::SetBackgroundColor(const SkColor& color) {
179 background_color_ = color; 179 background_color_ = color;
180 } 180 }
181 181
182 const vr::Colorf& UiScene::GetBackgroundColor() const { 182 const SkColor& UiScene::GetBackgroundColor() const {
183 return background_color_; 183 return background_color_;
184 } 184 }
185 185
186 void UiScene::SetBackgroundDistance(float distance) { 186 void UiScene::SetBackgroundDistance(float distance) {
187 background_distance_ = distance; 187 background_distance_ = distance;
188 } 188 }
189 189
190 float UiScene::GetBackgroundDistance() const { 190 float UiScene::GetBackgroundDistance() const {
191 return background_distance_; 191 return background_distance_;
192 } 192 }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 253
254 // TODO(mthiesse): Move this to UiSceneManager. 254 // TODO(mthiesse): Move this to UiSceneManager.
255 void UiScene::OnGLInitialized() { 255 void UiScene::OnGLInitialized() {
256 gl_initialized_ = true; 256 gl_initialized_ = true;
257 for (auto& element : ui_elements_) { 257 for (auto& element : ui_elements_) {
258 element->Initialize(); 258 element->Initialize();
259 } 259 }
260 } 260 }
261 261
262 } // namespace vr_shell 262 } // namespace vr_shell
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/ui_scene.h ('k') | chrome/browser/android/vr_shell/ui_scene_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698