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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 ui::TouchSelectionController* GetSelectionController() const; 84 ui::TouchSelectionController* GetSelectionController() const;
85 TouchSelectionControllerClientAura* GetSelectionControllerClient() const; 85 TouchSelectionControllerClientAura* GetSelectionControllerClient() const;
86 86
87 // Returns GetNativeView unless overridden for testing. 87 // Returns GetNativeView unless overridden for testing.
88 gfx::NativeView GetRenderWidgetHostViewParent() const; 88 gfx::NativeView GetRenderWidgetHostViewParent() const;
89 89
90 // Overridden from WebContentsView: 90 // Overridden from WebContentsView:
91 gfx::NativeView GetNativeView() const override; 91 gfx::NativeView GetNativeView() const override;
92 gfx::NativeView GetContentNativeView() const override; 92 gfx::NativeView GetContentNativeView() const override;
93 gfx::NativeWindow GetTopLevelNativeWindow() const override; 93 gfx::NativeWindow GetTopLevelNativeWindow() const override;
94 void GetScreenInfo(blink::WebScreenInfo* web_screen_info) const override; 94 void GetScreenInfo(ScreenInfo* screen_info) const override;
95 void GetContainerBounds(gfx::Rect* out) const override; 95 void GetContainerBounds(gfx::Rect* out) const override;
96 void SizeContents(const gfx::Size& size) override; 96 void SizeContents(const gfx::Size& size) override;
97 void Focus() override; 97 void Focus() override;
98 void SetInitialFocus() override; 98 void SetInitialFocus() override;
99 void StoreFocus() override; 99 void StoreFocus() override;
100 void RestoreFocus() override; 100 void RestoreFocus() override;
101 DropData* GetDropData() const override; 101 DropData* GetDropData() const override;
102 gfx::Rect GetViewBounds() const override; 102 gfx::Rect GetViewBounds() const override;
103 void CreateView(const gfx::Size& initial_size, 103 void CreateView(const gfx::Size& initial_size,
104 gfx::NativeView context) override; 104 gfx::NativeView context) override;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; 213 std::unique_ptr<GestureNavSimple> gesture_nav_simple_;
214 214
215 bool init_rwhv_with_null_parent_for_testing_; 215 bool init_rwhv_with_null_parent_for_testing_;
216 216
217 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 217 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
218 }; 218 };
219 219
220 } // namespace content 220 } // namespace content
221 221
222 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 222 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698