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

Side by Side Diff: ui/platform_window/android/platform_window_android.h

Issue 2431753002: Mus experiment in content shell on Android.
Patch Set: Addressed comments, fixed browser tests and deps. Created 4 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 UI_PLATFORM_WINDOW_ANDROID_PLATFORM_WINDOW_ANDROID_H_ 5 #ifndef UI_PLATFORM_WINDOW_ANDROID_PLATFORM_WINDOW_ANDROID_H_
6 #define UI_PLATFORM_WINDOW_ANDROID_PLATFORM_WINDOW_ANDROID_H_ 6 #define UI_PLATFORM_WINDOW_ANDROID_PLATFORM_WINDOW_ANDROID_H_
7 7
8 #include "base/android/jni_weak_ref.h" 8 #include "base/android/jni_weak_ref.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "gpu/ipc/common/surface_handle.h"
11 #include "ui/events/event_constants.h" 12 #include "ui/events/event_constants.h"
12 #include "ui/gfx/geometry/rect.h" 13 #include "ui/gfx/geometry/rect.h"
13 #include "ui/gfx/geometry/size.h" 14 #include "ui/gfx/geometry/size.h"
14 #include "ui/gfx/sequential_id_generator.h" 15 #include "ui/gfx/sequential_id_generator.h"
15 #include "ui/platform_window/android/android_window_export.h" 16 #include "ui/platform_window/android/android_window_export.h"
16 #include "ui/platform_window/android/platform_ime_controller_android.h" 17 #include "ui/platform_window/android/platform_ime_controller_android.h"
17 #include "ui/platform_window/platform_window.h" 18 #include "ui/platform_window/platform_window.h"
18 19
19 struct ANativeWindow; 20 struct ANativeWindow;
20 21
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 jfloat v_wheel); 55 jfloat v_wheel);
55 bool KeyEvent(JNIEnv* env, 56 bool KeyEvent(JNIEnv* env,
56 const base::android::JavaParamRef<jobject>& obj, 57 const base::android::JavaParamRef<jobject>& obj,
57 bool pressed, 58 bool pressed,
58 jint key_code, 59 jint key_code,
59 jint unicode_character); 60 jint unicode_character);
60 61
61 private: 62 private:
62 void ReleaseWindow(); 63 void ReleaseWindow();
63 64
65 void NotifyDelegateSurfaceCreated(gpu::SurfaceHandle surface_handle,
66 float device_pixel_ratio);
64 // Overridden from PlatformWindow: 67 // Overridden from PlatformWindow:
65 void Show() override; 68 void Show() override;
66 void Hide() override; 69 void Hide() override;
67 void Close() override; 70 void Close() override;
68 void SetBounds(const gfx::Rect& bounds) override; 71 void SetBounds(const gfx::Rect& bounds) override;
69 gfx::Rect GetBounds() override; 72 gfx::Rect GetBounds() override;
70 void SetTitle(const base::string16& title) override; 73 void SetTitle(const base::string16& title) override;
71 void SetCapture() override; 74 void SetCapture() override;
72 void ReleaseCapture() override; 75 void ReleaseCapture() override;
73 void ToggleFullscreen() override; 76 void ToggleFullscreen() override;
(...skipping 16 matching lines...) Expand all
90 PlatformImeControllerAndroid platform_ime_controller_; 93 PlatformImeControllerAndroid platform_ime_controller_;
91 94
92 base::WeakPtrFactory<PlatformWindowAndroid> weak_factory_; 95 base::WeakPtrFactory<PlatformWindowAndroid> weak_factory_;
93 96
94 DISALLOW_COPY_AND_ASSIGN(PlatformWindowAndroid); 97 DISALLOW_COPY_AND_ASSIGN(PlatformWindowAndroid);
95 }; 98 };
96 99
97 } // namespace ui 100 } // namespace ui
98 101
99 #endif // UI_PLATFORM_WINDOW_ANDROID_PLATFORM_WINDOW_ANDROID_H_ 102 #endif // UI_PLATFORM_WINDOW_ANDROID_PLATFORM_WINDOW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698