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

Side by Side Diff: content/browser/web_contents/web_contents_view_mus.cc

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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "content/browser/web_contents/web_contents_view_mus.h" 5 #include "content/browser/web_contents/web_contents_view_mus.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "content/browser/frame_host/interstitial_page_impl.h" 8 #include "content/browser/frame_host/interstitial_page_impl.h"
9 #include "content/browser/renderer_host/render_widget_host_view_mus.h" 9 #include "content/browser/renderer_host/render_widget_host_view_mus.h"
10 #include "content/browser/web_contents/web_contents_impl.h" 10 #include "content/browser/web_contents/web_contents_impl.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 gfx::NativeView WebContentsViewMus::GetContentNativeView() const { 55 gfx::NativeView WebContentsViewMus::GetContentNativeView() const {
56 RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView(); 56 RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
57 return rwhv ? rwhv->GetNativeView() : nullptr; 57 return rwhv ? rwhv->GetNativeView() : nullptr;
58 } 58 }
59 59
60 gfx::NativeWindow WebContentsViewMus::GetTopLevelNativeWindow() const { 60 gfx::NativeWindow WebContentsViewMus::GetTopLevelNativeWindow() const {
61 gfx::NativeWindow window = aura_window_->GetToplevelWindow(); 61 gfx::NativeWindow window = aura_window_->GetToplevelWindow();
62 return window ? window : delegate_->GetNativeWindow(); 62 return window ? window : delegate_->GetNativeWindow();
63 } 63 }
64 64
65 void WebContentsViewMus::GetScreenInfo( 65 void WebContentsViewMus::GetScreenInfo(ScreenInfo* screen_info) const {
66 blink::WebScreenInfo* web_screen_info) const {
67 // TODO(wjmaclean) Figure out what goes here. 66 // TODO(wjmaclean) Figure out what goes here.
68 } 67 }
69 68
70 void WebContentsViewMus::GetContainerBounds(gfx::Rect* out) const { 69 void WebContentsViewMus::GetContainerBounds(gfx::Rect* out) const {
71 *out = aura_window_->GetBoundsInScreen(); 70 *out = aura_window_->GetBoundsInScreen();
72 } 71 }
73 72
74 void WebContentsViewMus::SizeContents(const gfx::Size& size) { 73 void WebContentsViewMus::SizeContents(const gfx::Size& size) {
75 gfx::Rect bounds = aura_window_->bounds(); 74 gfx::Rect bounds = aura_window_->bounds();
76 if (bounds.size() != size) { 75 if (bounds.size() != size) {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 260
262 void WebContentsViewMus::OnWindowTargetVisibilityChanged(bool visible) {} 261 void WebContentsViewMus::OnWindowTargetVisibilityChanged(bool visible) {}
263 262
264 bool WebContentsViewMus::HasHitTestMask() const { 263 bool WebContentsViewMus::HasHitTestMask() const {
265 return false; 264 return false;
266 } 265 }
267 266
268 void WebContentsViewMus::GetHitTestMask(gfx::Path* mask) const {} 267 void WebContentsViewMus::GetHitTestMask(gfx::Path* mask) const {}
269 268
270 } // namespace content 269 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698