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

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

Issue 2867783002: 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
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 29 matching lines...) Expand all
40 VrBrowserInterface* browser_; 40 VrBrowserInterface* browser_;
41 UiScene* scene_; 41 UiScene* scene_;
42 42
43 // UI element pointers (not owned by the scene manager). 43 // UI element pointers (not owned by the scene manager).
44 UiElement* permanent_security_warning_ = nullptr; 44 UiElement* permanent_security_warning_ = nullptr;
45 UiElement* transient_security_warning_ = nullptr; 45 UiElement* transient_security_warning_ = nullptr;
46 UiElement* main_content_ = nullptr; 46 UiElement* main_content_ = nullptr;
47 47
48 bool web_vr_mode_ = false; 48 bool web_vr_mode_ = false;
49 bool secure_origin_ = false; 49 bool secure_origin_ = false;
50 bool content_rendering_enabled_ = true;
51 50
52 int next_available_id_ = 1; 51 int next_available_id_ = 1;
53 52
54 std::vector<UiElement*> browser_ui_elements_; 53 std::vector<UiElement*> browser_ui_elements_;
55 54
56 base::OneShotTimer security_warning_timer_; 55 base::OneShotTimer security_warning_timer_;
57 56
58 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; 57 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
59 58
60 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); 59 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
61 }; 60 };
62 61
63 } // namespace vr_shell 62 } // namespace vr_shell
64 63
65 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 64 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698