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

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

Issue 2122023002: Cross-process frames should be notified of device scale factor changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Version of patch without second test. Created 4 years, 4 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
« no previous file with comments | « content/browser/web_contents/web_contents_view_mus.h ('k') | content/common/page_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
66 blink::WebScreenInfo* web_screen_info) const {
67 // TODO(wjmaclean) Figure out what goes here.
68 }
69
65 void WebContentsViewMus::GetContainerBounds(gfx::Rect* out) const { 70 void WebContentsViewMus::GetContainerBounds(gfx::Rect* out) const {
66 *out = aura_window_->GetBoundsInScreen(); 71 *out = aura_window_->GetBoundsInScreen();
67 } 72 }
68 73
69 void WebContentsViewMus::SizeContents(const gfx::Size& size) { 74 void WebContentsViewMus::SizeContents(const gfx::Size& size) {
70 gfx::Rect bounds = aura_window_->bounds(); 75 gfx::Rect bounds = aura_window_->bounds();
71 if (bounds.size() != size) { 76 if (bounds.size() != size) {
72 bounds.set_size(size); 77 bounds.set_size(size);
73 aura_window_->SetBounds(bounds); 78 aura_window_->SetBounds(bounds);
74 SizeChangedCommon(size); 79 SizeChangedCommon(size);
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 261
257 void WebContentsViewMus::OnWindowTargetVisibilityChanged(bool visible) {} 262 void WebContentsViewMus::OnWindowTargetVisibilityChanged(bool visible) {}
258 263
259 bool WebContentsViewMus::HasHitTestMask() const { 264 bool WebContentsViewMus::HasHitTestMask() const {
260 return false; 265 return false;
261 } 266 }
262 267
263 void WebContentsViewMus::GetHitTestMask(gfx::Path* mask) const {} 268 void WebContentsViewMus::GetHitTestMask(gfx::Path* mask) const {}
264 269
265 } // namespace content 270 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_mus.h ('k') | content/common/page_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698