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

Unified Diff: chrome/browser/android/vr_shell/textures/url_bar_texture.h

Issue 2960903002: VR: Use ToolbarModel to drive VR URL bar state. (Closed)
Patch Set: Update toolbar build file to include vector icons for Android. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/textures/url_bar_texture.h
diff --git a/chrome/browser/android/vr_shell/textures/url_bar_texture.h b/chrome/browser/android/vr_shell/textures/url_bar_texture.h
index 11e18d0d57c80d7dc75aa72f5d0b0fff221555b3..bc24715af1132423033d6005ee0ff5e31482edac 100644
--- a/chrome/browser/android/vr_shell/textures/url_bar_texture.h
+++ b/chrome/browser/android/vr_shell/textures/url_bar_texture.h
@@ -12,6 +12,8 @@
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/android/vr_shell/textures/ui_texture.h"
+#include "chrome/browser/android/vr_shell/toolbar_state.h"
+#include "chrome/browser/android/vr_shell/ui_interface.h"
#include "chrome/browser/android/vr_shell/ui_unsupported_mode.h"
#include "components/security_state/core/security_state.h"
#include "ui/gfx/geometry/rect_f.h"
@@ -41,9 +43,8 @@ class UrlBarTexture : public UiTexture {
gfx::Size GetPreferredTextureSize(int width) const override;
gfx::SizeF GetDrawnSize() const override;
- void SetURL(const GURL& gurl);
+ void SetToolbarState(const ToolbarState& state);
void SetHistoryButtonsEnabled(bool can_go_back);
- void SetSecurityInfo(security_state::SecurityLevel level, bool malware);
bool HitsBackButton(const gfx::PointF& position) const;
bool HitsUrlBar(const gfx::PointF& position) const;
@@ -76,10 +77,7 @@ class UrlBarTexture : public UiTexture {
bool back_pressed_ = false;
bool can_go_back_ = false;
- GURL gurl_;
- security_state::SecurityLevel security_level_ =
- security_state::SecurityLevel::NONE;
- bool malware_ = false;
+ ToolbarState state_;
GURL last_drawn_gurl_;
bool has_back_button_ = true;
« no previous file with comments | « chrome/browser/android/vr_shell/BUILD.gn ('k') | chrome/browser/android/vr_shell/textures/url_bar_texture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698