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

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

Issue 2946523002: VR: Support security chip text on URL bar. (Closed)
Patch Set: Address comments. 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/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 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 608
609 void UiSceneManager::OnExitPromptSecondaryButtonClicked() { 609 void UiSceneManager::OnExitPromptSecondaryButtonClicked() {
610 OnUnsupportedMode(UiUnsupportedMode::kUnhandledPageInfo); 610 OnUnsupportedMode(UiUnsupportedMode::kUnhandledPageInfo);
611 } 611 }
612 612
613 void UiSceneManager::SetURL(const GURL& gurl) { 613 void UiSceneManager::SetURL(const GURL& gurl) {
614 url_bar_->SetURL(gurl); 614 url_bar_->SetURL(gurl);
615 transient_url_bar_->SetURL(gurl); 615 transient_url_bar_->SetURL(gurl);
616 } 616 }
617 617
618 void UiSceneManager::SetSecurityLevel(security_state::SecurityLevel level) { 618 void UiSceneManager::SetSecurityInfo(security_state::SecurityLevel level,
619 url_bar_->SetSecurityLevel(level); 619 bool malware) {
620 transient_url_bar_->SetSecurityLevel(level); 620 url_bar_->SetSecurityInfo(level, malware);
621 transient_url_bar_->SetSecurityInfo(level, malware);
621 } 622 }
622 623
623 void UiSceneManager::SetLoading(bool loading) { 624 void UiSceneManager::SetLoading(bool loading) {
624 loading_indicator_->SetLoading(loading); 625 loading_indicator_->SetLoading(loading);
625 } 626 }
626 627
627 void UiSceneManager::SetLoadProgress(float progress) { 628 void UiSceneManager::SetLoadProgress(float progress) {
628 loading_indicator_->SetLoadProgress(progress); 629 loading_indicator_->SetLoadProgress(progress);
629 } 630 }
630 631
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 if (fullscreen_) 664 if (fullscreen_)
664 return ColorScheme::kModeFullscreen; 665 return ColorScheme::kModeFullscreen;
665 return ColorScheme::kModeNormal; 666 return ColorScheme::kModeNormal;
666 } 667 }
667 668
668 const ColorScheme& UiSceneManager::color_scheme() const { 669 const ColorScheme& UiSceneManager::color_scheme() const {
669 return ColorScheme::GetColorScheme(mode()); 670 return ColorScheme::GetColorScheme(mode());
670 } 671 }
671 672
672 } // namespace vr_shell 673 } // namespace vr_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698