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

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

Issue 2960903002: VR: Use ToolbarModel to drive VR URL bar state. (Closed)
Patch Set: Created 3 years, 5 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 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 } 697 }
698 698
699 void UiSceneManager::OnExitPromptPrimaryButtonClicked() { 699 void UiSceneManager::OnExitPromptPrimaryButtonClicked() {
700 CloseExitPrompt(); 700 CloseExitPrompt();
701 } 701 }
702 702
703 void UiSceneManager::OnExitPromptSecondaryButtonClicked() { 703 void UiSceneManager::OnExitPromptSecondaryButtonClicked() {
704 OnUnsupportedMode(UiUnsupportedMode::kUnhandledPageInfo); 704 OnUnsupportedMode(UiUnsupportedMode::kUnhandledPageInfo);
705 } 705 }
706 706
707 void UiSceneManager::SetURL(const GURL& gurl) { 707 void UiSceneManager::SetToolbarState(const ToolbarState& state) {
708 url_bar_->SetURL(gurl); 708 url_bar_->SetToolbarState(state);
709 transient_url_bar_->SetURL(gurl); 709 transient_url_bar_->SetToolbarState(state);
710 }
711
712 void UiSceneManager::SetSecurityInfo(security_state::SecurityLevel level,
713 bool malware) {
714 url_bar_->SetSecurityInfo(level, malware);
715 transient_url_bar_->SetSecurityInfo(level, malware);
716 } 710 }
717 711
718 void UiSceneManager::SetLoading(bool loading) { 712 void UiSceneManager::SetLoading(bool loading) {
719 loading_indicator_->SetLoading(loading); 713 loading_indicator_->SetLoading(loading);
720 } 714 }
721 715
722 void UiSceneManager::SetLoadProgress(float progress) { 716 void UiSceneManager::SetLoadProgress(float progress) {
723 loading_indicator_->SetLoadProgress(progress); 717 loading_indicator_->SetLoadProgress(progress);
724 } 718 }
725 719
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 if (fullscreen_) 752 if (fullscreen_)
759 return ColorScheme::kModeFullscreen; 753 return ColorScheme::kModeFullscreen;
760 return ColorScheme::kModeNormal; 754 return ColorScheme::kModeNormal;
761 } 755 }
762 756
763 const ColorScheme& UiSceneManager::color_scheme() const { 757 const ColorScheme& UiSceneManager::color_scheme() const {
764 return ColorScheme::GetColorScheme(mode()); 758 return ColorScheme::GetColorScheme(mode());
765 } 759 }
766 760
767 } // namespace vr_shell 761 } // namespace vr_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698