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

Side by Side Diff: ui/android/display_android_manager.h

Issue 2747143005: Revert of Add display::GetDisplayNearestView (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « headless/lib/browser/headless_screen.cc ('k') | ui/android/display_android_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_ 5 #ifndef UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
6 #define UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_ 6 #define UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "ui/display/screen_base.h" 12 #include "ui/display/screen_base.h"
13 13
14 namespace ui { 14 namespace ui {
15 15
16 class DisplayAndroidManager : public display::ScreenBase { 16 class DisplayAndroidManager : public display::ScreenBase {
17 public: 17 public:
18 ~DisplayAndroidManager() override; 18 ~DisplayAndroidManager() override;
19 19
20 // Screen interface. 20 // Screen interface.
21 21
22 display::Display GetDisplayNearestWindow( 22 display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
23 gfx::NativeWindow window) const override;
24 display::Display GetDisplayNearestView(gfx::NativeView view) const override;
25 display::Display GetDisplayNearestPoint( 23 display::Display GetDisplayNearestPoint(
26 const gfx::Point& point) const override; 24 const gfx::Point& point) const override;
27 display::Display GetDisplayMatching( 25 display::Display GetDisplayMatching(
28 const gfx::Rect& match_rect) const override; 26 const gfx::Rect& match_rect) const override;
29 27
30 // Methods called from Java. 28 // Methods called from Java.
31 29
32 void UpdateDisplay(JNIEnv* env, 30 void UpdateDisplay(JNIEnv* env,
33 const base::android::JavaParamRef<jobject>& jobject, 31 const base::android::JavaParamRef<jobject>& jobject,
34 jint sdkDisplayId, 32 jint sdkDisplayId,
(...skipping 17 matching lines...) Expand all
52 DisplayAndroidManager(); 50 DisplayAndroidManager();
53 51
54 int primary_display_id_ = 0; 52 int primary_display_id_ = 0;
55 53
56 DISALLOW_COPY_AND_ASSIGN(DisplayAndroidManager); 54 DISALLOW_COPY_AND_ASSIGN(DisplayAndroidManager);
57 }; 55 };
58 56
59 } // namespace ui 57 } // namespace ui
60 58
61 #endif // UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_ 59 #endif // UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
OLDNEW
« no previous file with comments | « headless/lib/browser/headless_screen.cc ('k') | ui/android/display_android_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698