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

Unified Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2705293002: Chrome VR clang-format cleanup (Closed)
Patch Set: Rebase to ToT. Created 3 years, 10 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
« no previous file with comments | « chrome/browser/android/vr_shell/vr_math.cc ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 63f9e39a12325997d2557feed45100f24a6138cb..c168e9aea5b937721ed568b980cbf4563f78321c 100644
--- a/chrome/browser/android/vr_shell/vr_shell.h
+++ b/chrome/browser/android/vr_shell/vr_shell.h
@@ -65,7 +65,8 @@ class VrMetricsHelper;
// must only be used on the UI thread.
class VrShell : public device::GvrDelegate, content::WebContentsObserver {
public:
- VrShell(JNIEnv* env, jobject obj,
+ VrShell(JNIEnv* env,
+ jobject obj,
ui::WindowAndroid* content_window,
content::WebContents* ui_contents,
ui::WindowAndroid* ui_window,
@@ -81,10 +82,8 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
void OnTriggerEvent(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
- void OnPause(JNIEnv* env,
- const base::android::JavaParamRef<jobject>& obj);
- void OnResume(JNIEnv* env,
- const base::android::JavaParamRef<jobject>& obj);
+ void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
+ void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
void SetSurface(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<jobject>& surface);
@@ -96,13 +95,17 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
double progress);
void OnTabListCreated(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
- jobjectArray tabs, jobjectArray incognito_tabs);
+ jobjectArray tabs,
+ jobjectArray incognito_tabs);
void OnTabUpdated(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
- jboolean incognito, jint id, jstring jtitle);
+ jboolean incognito,
+ jint id,
+ jstring jtitle);
void OnTabRemoved(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
- jboolean incognito, jint id);
+ jboolean incognito,
+ jint id);
base::android::ScopedJavaGlobalRef<jobject> TakeContentSurface(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
@@ -130,12 +133,16 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
void ContentPhysicalBoundsChanged(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& object,
- jint width, jint height, jfloat dpr);
+ jint width,
+ jint height,
+ jfloat dpr);
void UIPhysicalBoundsChanged(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& object,
- jint width, jint height, jfloat dpr);
+ jint width,
+ jint height,
+ jfloat dpr);
void UpdateScene(const base::ListValue* args);
« no previous file with comments | « chrome/browser/android/vr_shell/vr_math.cc ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698