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

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

Issue 2878543002: Refactor VR Shell Input. Locks input to click/scroll targets. (Closed)
Patch Set: Address comments 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 30 matching lines...) Expand all
41 void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward); 41 void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward);
42 42
43 void OnAppButtonClicked(); 43 void OnAppButtonClicked();
44 void OnAppButtonGesturePerformed(UiInterface::Direction direction); 44 void OnAppButtonGesturePerformed(UiInterface::Direction direction);
45 45
46 private: 46 private:
47 void CreateSecurityWarnings(); 47 void CreateSecurityWarnings();
48 void CreateContentQuad(); 48 void CreateContentQuad();
49 void CreateBackground(); 49 void CreateBackground();
50 void CreateUrlBar(); 50 void CreateUrlBar();
51 void CreateCloseButton();
51 52
52 void ConfigureSecurityWarnings(); 53 void ConfigureSecurityWarnings();
53 void OnSecurityWarningTimer(); 54 void OnSecurityWarningTimer();
54 void OnBackButtonClicked(); 55 void OnBackButtonClicked();
56 void OnCloseButtonClicked();
55 int AllocateId(); 57 int AllocateId();
56 58
57 VrBrowserInterface* browser_; 59 VrBrowserInterface* browser_;
58 UiScene* scene_; 60 UiScene* scene_;
59 61
60 // UI element pointers (not owned by the scene manager). 62 // UI element pointers (not owned by the scene manager).
61 UiElement* permanent_security_warning_ = nullptr; 63 UiElement* permanent_security_warning_ = nullptr;
62 UiElement* transient_security_warning_ = nullptr; 64 UiElement* transient_security_warning_ = nullptr;
63 UiElement* main_content_ = nullptr; 65 UiElement* main_content_ = nullptr;
64 UrlBar* url_bar_ = nullptr; 66 UrlBar* url_bar_ = nullptr;
(...skipping 10 matching lines...) Expand all
75 base::OneShotTimer security_warning_timer_; 77 base::OneShotTimer security_warning_timer_;
76 78
77 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_; 79 base::WeakPtrFactory<UiSceneManager> weak_ptr_factory_;
78 80
79 DISALLOW_COPY_AND_ASSIGN(UiSceneManager); 81 DISALLOW_COPY_AND_ASSIGN(UiSceneManager);
80 }; 82 };
81 83
82 } // namespace vr_shell 84 } // namespace vr_shell
83 85
84 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_ 86 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements/url_bar.cc ('k') | chrome/browser/android/vr_shell/ui_scene_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698