| Index: chrome/browser/android/vr_shell/vr_shell.h
|
| diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h
|
| index 8b71dc0289b666053f80d3ee30d8fe4fab5567ca..354ecf5386af95b82b53ae32396f4c2116f8ba9a 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell.h
|
| +++ b/chrome/browser/android/vr_shell/vr_shell.h
|
| @@ -47,7 +47,11 @@ enum UiAction {
|
| RELOAD,
|
| ZOOM_OUT,
|
| ZOOM_IN,
|
| - RELOAD_UI
|
| + RELOAD_UI,
|
| + KEY_EVENT,
|
| + LOAD_URL,
|
| + OMNIBOX_CONTENT,
|
| + SET_CONTENT_PAUSED,
|
| };
|
|
|
| class VrMetricsHelper;
|
| @@ -127,7 +131,8 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
|
| void UpdateScene(const base::ListValue* args);
|
|
|
| // Perform a UI action triggered by the javascript API.
|
| - void DoUiAction(const UiAction action);
|
| + void DoUiAction(const UiAction action,
|
| + const base::DictionaryValue* arguments);
|
|
|
| void SetContentCssSize(float width, float height, float dpr);
|
| void SetUiCssSize(float width, float height, float dpr);
|
| @@ -147,7 +152,10 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
|
| void MainFrameWasResized(bool width_changed) override;
|
| void WebContentsDestroyed() override;
|
|
|
| + void SetContentPaused(bool paused);
|
| +
|
| std::unique_ptr<UiInterface> html_interface_;
|
| + bool content_paused_ = false;
|
|
|
| content::WebContents* main_contents_;
|
| std::unique_ptr<VrCompositor> content_compositor_;
|
|
|