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

Unified Diff: ui/android/display_android_manager.h

Issue 2514633002: Revert of Android: support multiple displays on C++ side (Closed)
Patch Set: Created 4 years, 1 month 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 | « ui/android/DEPS ('k') | ui/android/display_android_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/display_android_manager.h
diff --git a/ui/android/display_android_manager.h b/ui/android/display_android_manager.h
deleted file mode 100644
index 9eae6fac7383d25f316096e608828bd690412835..0000000000000000000000000000000000000000
--- a/ui/android/display_android_manager.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
-#define UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
-
-#include <jni.h>
-
-#include "base/android/jni_android.h"
-#include "base/macros.h"
-#include "ui/display/screen_base.h"
-
-namespace ui {
-
-class DisplayAndroidManager : public display::ScreenBase {
- public:
- ~DisplayAndroidManager() override;
-
- // Screen interface.
-
- display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
- display::Display GetDisplayNearestPoint(
- const gfx::Point& point) const override;
- display::Display GetDisplayMatching(
- const gfx::Rect& match_rect) const override;
-
- // Methods called from Java.
-
- void UpdateDisplay(JNIEnv* env,
- const base::android::JavaParamRef<jobject>& jobject,
- jint sdkDisplayId,
- jint physicalWidth,
- jint physicalHeight,
- jint width,
- jint height,
- jfloat dipScale,
- jint rotationDegrees,
- jint bitsPerPixel,
- jint bitsPerComponent);
- void RemoveDisplay(JNIEnv* env,
- const base::android::JavaParamRef<jobject>& jobject,
- jint sdkDisplayId);
- void SetPrimaryDisplayId(JNIEnv* env,
- const base::android::JavaParamRef<jobject>& jobject,
- jint sdkDisplayId);
-
- private:
- friend void SetScreenAndroid();
- DisplayAndroidManager();
-
- int primary_display_id_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(DisplayAndroidManager);
-};
-
-} // namespace ui
-
-#endif // UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
« no previous file with comments | « ui/android/DEPS ('k') | ui/android/display_android_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698