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

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

Issue 2874103003: Revert of App button click exits WebVR presentation. (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
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/ui_scene_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 // UI element pointers (not owned by the scene manager). 60 // UI element pointers (not owned by the scene manager).
61 UiElement* permanent_security_warning_ = nullptr; 61 UiElement* permanent_security_warning_ = nullptr;
62 UiElement* transient_security_warning_ = nullptr; 62 UiElement* transient_security_warning_ = nullptr;
63 UiElement* main_content_ = nullptr; 63 UiElement* main_content_ = nullptr;
64 UrlBar* url_bar_ = nullptr; 64 UrlBar* url_bar_ = nullptr;
65 65
66 bool in_cct_; 66 bool in_cct_;
67 bool web_vr_mode_; 67 bool web_vr_mode_;
68 bool secure_origin_ = false; 68 bool secure_origin_ = false;
69 bool content_rendering_enabled_ = true;
69 70
70 int next_available_id_ = 1; 71 int next_available_id_ = 1;
71 72
72 std::vector<UiElement*> browser_ui_elements_; 73 std::vector<UiElement*> browser_ui_elements_;
73 74
74 base::OneShotTimer security_warning_timer_; 75 base::OneShotTimer security_warning_timer_;
75 76
76 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; 77 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
77 78
78 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); 79 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
79 }; 80 };
80 81
81 } // namespace vr_shell 82 } // namespace vr_shell
82 83
83 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 84 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/ui_scene_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698