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

Unified Diff: chrome/browser/android/vr_shell/vr_web_contents_observer.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/vr_web_contents_observer.h
diff --git a/chrome/browser/android/vr_shell/vr_web_contents_observer.h b/chrome/browser/android/vr_shell/vr_web_contents_observer.h
index 12b4bd6bce43c340d4d5213a0baa7bded597ec9a..ac10b05955d76d503f90b900b5d176b8dbee6a85 100644
--- a/chrome/browser/android/vr_shell/vr_web_contents_observer.h
+++ b/chrome/browser/android/vr_shell/vr_web_contents_observer.h
@@ -16,13 +16,15 @@ namespace vr_shell {
class UiInterface;
class VrShell;
+class ToolbarHelper;
class CONTENT_EXPORT VrWebContentsObserver
: public content::WebContentsObserver {
public:
VrWebContentsObserver(content::WebContents* web_contents,
+ VrShell* vr_shell,
UiInterface* ui_interface,
- VrShell* vr_shell);
+ ToolbarHelper* toolbar);
~VrWebContentsObserver() override;
void SetUiInterface(UiInterface* ui_interface);
@@ -47,9 +49,10 @@ class CONTENT_EXPORT VrWebContentsObserver
void RenderViewHostChanged(content::RenderViewHost* old_host,
content::RenderViewHost* new_host) override;
- // This class does not own the UI interface.
- UiInterface* ui_interface_;
+ // This class does not own these pointers.
VrShell* vr_shell_;
+ UiInterface* ui_interface_;
+ ToolbarHelper* toolbar_;
DISALLOW_COPY_AND_ASSIGN(VrWebContentsObserver);
};
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | chrome/browser/android/vr_shell/vr_web_contents_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698