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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_base.cc

Issue 10540123: Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 | Annotate | Revision Log
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 #include "content/browser/renderer_host/render_widget_host_view_base.h" 5 #include "content/browser/renderer_host/render_widget_host_view_base.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/accessibility/browser_accessibility_manager.h" 8 #include "content/browser/accessibility/browser_accessibility_manager.h"
9 #include "content/browser/renderer_host/render_widget_host_impl.h" 9 #include "content/browser/renderer_host/render_widget_host_impl.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 RenderWidgetHostViewBase::GetBrowserAccessibilityManager() const { 91 RenderWidgetHostViewBase::GetBrowserAccessibilityManager() const {
92 return browser_accessibility_manager_.get(); 92 return browser_accessibility_manager_.get();
93 } 93 }
94 94
95 void RenderWidgetHostViewBase::SetBrowserAccessibilityManager( 95 void RenderWidgetHostViewBase::SetBrowserAccessibilityManager(
96 BrowserAccessibilityManager* manager) { 96 BrowserAccessibilityManager* manager) {
97 browser_accessibility_manager_.reset(manager); 97 browser_accessibility_manager_.reset(manager);
98 } 98 }
99 99
100 void RenderWidgetHostViewBase::UpdateScreenInfo() { 100 void RenderWidgetHostViewBase::UpdateScreenInfo() {
101 gfx::Display monitor = gfx::Screen::GetMonitorNearestPoint( 101 gfx::Display display = gfx::Screen::GetDisplayNearestPoint(
102 GetViewBounds().origin()); 102 GetViewBounds().origin());
103 if (current_display_area_ == monitor.bounds() && 103 if (current_display_area_ == display.bounds() &&
104 current_device_scale_factor_ == monitor.device_scale_factor()) 104 current_device_scale_factor_ == display.device_scale_factor())
105 return; 105 return;
106 current_display_area_ = monitor.bounds(); 106 current_display_area_ = display.bounds();
107 current_device_scale_factor_ = monitor.device_scale_factor(); 107 current_device_scale_factor_ = display.device_scale_factor();
108 if (GetRenderWidgetHost()) { 108 if (GetRenderWidgetHost()) {
109 RenderWidgetHostImpl* impl = 109 RenderWidgetHostImpl* impl =
110 RenderWidgetHostImpl::From(GetRenderWidgetHost()); 110 RenderWidgetHostImpl::From(GetRenderWidgetHost());
111 impl->NotifyScreenInfoChanged(); 111 impl->NotifyScreenInfoChanged();
112 } 112 }
113 } 113 }
114 114
115 } // namespace content 115 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698