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

Side by Side Diff: headless/lib/browser/headless_window_tree_host.h

Issue 2669693002: Minimize headless code that refers to aura. (Closed)
Patch Set: remove one window_tree_host reference 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 unified diff | Download patch
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 HEADLESS_LIB_BROWSER_HEADLESS_WINDOW_TREE_HOST_H_ 5 #ifndef HEADLESS_LIB_BROWSER_HEADLESS_WINDOW_TREE_HOST_H_
6 #define HEADLESS_LIB_BROWSER_HEADLESS_WINDOW_TREE_HOST_H_ 6 #define HEADLESS_LIB_BROWSER_HEADLESS_WINDOW_TREE_HOST_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "headless/lib/browser/headless_window_parenting_client.h"
9 #include "ui/aura/window_tree_host.h" 12 #include "ui/aura/window_tree_host.h"
10 #include "ui/events/platform/platform_event_dispatcher.h" 13 #include "ui/events/platform/platform_event_dispatcher.h"
11 #include "ui/gfx/geometry/rect.h" 14 #include "ui/gfx/geometry/rect.h"
12 15
13 namespace headless { 16 namespace headless {
14 17
15 class HeadlessWindowTreeHost : public aura::WindowTreeHost, 18 class HeadlessWindowTreeHost : public aura::WindowTreeHost,
16 public ui::PlatformEventDispatcher { 19 public ui::PlatformEventDispatcher {
17 public: 20 public:
18 explicit HeadlessWindowTreeHost(const gfx::Rect& bounds); 21 explicit HeadlessWindowTreeHost(const gfx::Rect& bounds);
19 ~HeadlessWindowTreeHost() override; 22 ~HeadlessWindowTreeHost() override;
20 23
24 void SetParentWindow(gfx::NativeWindow window);
25 gfx::NativeWindow GetTopWindowContainingPoint(const gfx::Point& point);
Sami 2017/02/10 13:53:11 Looks like this isn't called from anywhere. Let's
26
21 // ui::PlatformEventDispatcher: 27 // ui::PlatformEventDispatcher:
22 bool CanDispatchEvent(const ui::PlatformEvent& event) override; 28 bool CanDispatchEvent(const ui::PlatformEvent& event) override;
23 uint32_t DispatchEvent(const ui::PlatformEvent& event) override; 29 uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
24 30
25 // WindowTreeHost: 31 // WindowTreeHost:
26 ui::EventSource* GetEventSource() override; 32 ui::EventSource* GetEventSource() override;
27 gfx::AcceleratedWidget GetAcceleratedWidget() override; 33 gfx::AcceleratedWidget GetAcceleratedWidget() override;
28 void ShowImpl() override; 34 void ShowImpl() override;
29 void HideImpl() override; 35 void HideImpl() override;
30 gfx::Rect GetBoundsInPixels() const override; 36 gfx::Rect GetBoundsInPixels() const override;
31 void SetBoundsInPixels(const gfx::Rect& bounds) override; 37 void SetBoundsInPixels(const gfx::Rect& bounds) override;
32 gfx::Point GetLocationOnScreenInPixels() const override; 38 gfx::Point GetLocationOnScreenInPixels() const override;
33 void SetCapture() override; 39 void SetCapture() override;
34 void ReleaseCapture() override; 40 void ReleaseCapture() override;
35 void SetCursorNative(gfx::NativeCursor cursor_type) override; 41 void SetCursorNative(gfx::NativeCursor cursor_type) override;
36 void MoveCursorToScreenLocationInPixels(const gfx::Point& location) override; 42 void MoveCursorToScreenLocationInPixels(const gfx::Point& location) override;
37 void OnCursorVisibilityChangedNative(bool show) override; 43 void OnCursorVisibilityChangedNative(bool show) override;
38 gfx::ICCProfile GetICCProfileForCurrentDisplay() override; 44 gfx::ICCProfile GetICCProfileForCurrentDisplay() override;
39 45
40 private: 46 private:
41 gfx::Rect bounds_; 47 gfx::Rect bounds_;
48 std::unique_ptr<aura::client::WindowParentingClient> window_parenting_client_;
42 49
43 DISALLOW_COPY_AND_ASSIGN(HeadlessWindowTreeHost); 50 DISALLOW_COPY_AND_ASSIGN(HeadlessWindowTreeHost);
44 }; 51 };
45 52
46 } // namespace headless 53 } // namespace headless
47 54
48 #endif // HEADLESS_LIB_BROWSER_HEADLESS_WINDOW_TREE_HOST_H_ 55 #endif // HEADLESS_LIB_BROWSER_HEADLESS_WINDOW_TREE_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698