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

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

Issue 2902393002: [vr] Bail on unhandled code points. (Closed)
Patch Set: Created 3 years, 7 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/textures/close_button_texture.h" 9 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h"
10 #include "chrome/browser/android/vr_shell/textures/ui_texture.h" 10 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 element->set_draw_phase(0); 288 element->set_draw_phase(0);
289 floor_grid_ = element.get(); 289 floor_grid_ = element.get();
290 content_elements_.push_back(element.get()); 290 content_elements_.push_back(element.get());
291 scene_->AddUiElement(std::move(element)); 291 scene_->AddUiElement(std::move(element));
292 292
293 scene_->SetBackgroundColor(kBackgroundHorizonColor); 293 scene_->SetBackgroundColor(kBackgroundHorizonColor);
294 } 294 }
295 295
296 void UiSceneManager::CreateUrlBar() { 296 void UiSceneManager::CreateUrlBar() {
297 // TODO(cjgrant): Incorporate final size and position. 297 // TODO(cjgrant): Incorporate final size and position.
298 auto url_bar = base::MakeUnique<UrlBar>(512); 298 auto url_bar = base::MakeUnique<UrlBar>(
299 512,
300 base::Bind(&UiSceneManager::OnUnsupportedMode, base::Unretained(this)));
299 url_bar->set_debug_id(kUrlBar); 301 url_bar->set_debug_id(kUrlBar);
300 url_bar->set_id(AllocateId()); 302 url_bar->set_id(AllocateId());
301 url_bar->set_translation({0, kUrlBarVerticalOffset, -kUrlBarDistance}); 303 url_bar->set_translation({0, kUrlBarVerticalOffset, -kUrlBarDistance});
302 url_bar->set_size({kUrlBarWidth, kUrlBarHeight, 1}); 304 url_bar->set_size({kUrlBarWidth, kUrlBarHeight, 1});
303 url_bar->SetBackButtonCallback( 305 url_bar->SetBackButtonCallback(
304 base::Bind(&UiSceneManager::OnBackButtonClicked, base::Unretained(this))); 306 base::Bind(&UiSceneManager::OnBackButtonClicked, base::Unretained(this)));
305 url_bar_ = url_bar.get(); 307 url_bar_ = url_bar.get();
306 control_elements_.push_back(url_bar.get()); 308 control_elements_.push_back(url_bar.get());
307 scene_->AddUiElement(std::move(url_bar)); 309 scene_->AddUiElement(std::move(url_bar));
308 310
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 ConfigureScene(); 473 ConfigureScene();
472 } 474 }
473 475
474 void UiSceneManager::SetHistoryButtonsEnabled(bool can_go_back, 476 void UiSceneManager::SetHistoryButtonsEnabled(bool can_go_back,
475 bool can_go_forward) {} 477 bool can_go_forward) {}
476 478
477 void UiSceneManager::OnCloseButtonClicked() { 479 void UiSceneManager::OnCloseButtonClicked() {
478 browser_->ExitCct(); 480 browser_->ExitCct();
479 } 481 }
480 482
483 void UiSceneManager::OnUnsupportedMode() {
484 browser_->OnUnsupportedMode();
485 }
486
481 int UiSceneManager::AllocateId() { 487 int UiSceneManager::AllocateId() {
482 return next_available_id_++; 488 return next_available_id_++;
483 } 489 }
484 490
485 } // namespace vr_shell 491 } // namespace vr_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698