summaryrefslogtreecommitdiff
path: root/chromium/ui/display/screen.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/display/screen.h
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/display/screen.h')
-rw-r--r--chromium/ui/display/screen.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/ui/display/screen.h b/chromium/ui/display/screen.h
index 2263985910f..7742ef3e192 100644
--- a/chromium/ui/display/screen.h
+++ b/chromium/ui/display/screen.h
@@ -128,9 +128,17 @@ class DISPLAY_EXPORT Screen {
virtual std::string GetCurrentWorkspace();
private:
+ friend class ScopedDisplayForNewWindows;
+
+ // Used to temporarily override the value from SetDisplayForNewWindows() by
+ // creating an instance of ScopedDisplayForNewWindows. Call with
+ // |kInvalidDisplayId| to unset.
+ void SetScopedDisplayForNewWindows(int64_t display_id);
+
static gfx::NativeWindow GetWindowForView(gfx::NativeView view);
int64_t display_id_for_new_windows_;
+ int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId;
DISALLOW_COPY_AND_ASSIGN(Screen);
};