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

Side by Side Diff: content/browser/web_contents/web_contents_impl.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 (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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 } 984 }
985 985
986 UpdateZoom(level); 986 UpdateZoom(level);
987 } 987 }
988 988
989 void WebContentsImpl::UpdateDeviceScaleFactor(double device_scale_factor) { 989 void WebContentsImpl::UpdateDeviceScaleFactor(double device_scale_factor) {
990 SendPageMessage( 990 SendPageMessage(
991 new PageMsg_SetDeviceScaleFactor(MSG_ROUTING_NONE, device_scale_factor)); 991 new PageMsg_SetDeviceScaleFactor(MSG_ROUTING_NONE, device_scale_factor));
992 } 992 }
993 993
994 void WebContentsImpl::GetScreenInfo(blink::WebScreenInfo* web_screen_info) { 994 void WebContentsImpl::GetScreenInfo(ScreenInfo* screen_info) {
995 if (GetView()) 995 if (GetView())
996 GetView()->GetScreenInfo(web_screen_info); 996 GetView()->GetScreenInfo(screen_info);
997 } 997 }
998 998
999 WebUI* WebContentsImpl::CreateSubframeWebUI(const GURL& url, 999 WebUI* WebContentsImpl::CreateSubframeWebUI(const GURL& url,
1000 const std::string& frame_name) { 1000 const std::string& frame_name) {
1001 DCHECK(!frame_name.empty()); 1001 DCHECK(!frame_name.empty());
1002 return CreateWebUI(url, frame_name); 1002 return CreateWebUI(url, frame_name);
1003 } 1003 }
1004 1004
1005 WebUI* WebContentsImpl::GetWebUI() const { 1005 WebUI* WebContentsImpl::GetWebUI() const {
1006 WebUI* commited_web_ui = GetCommittedWebUI(); 1006 WebUI* commited_web_ui = GetCommittedWebUI();
(...skipping 4198 matching lines...) Expand 10 before | Expand all | Expand 10 after
5205 for (RenderViewHost* render_view_host : render_view_host_set) 5205 for (RenderViewHost* render_view_host : render_view_host_set)
5206 render_view_host->OnWebkitPreferencesChanged(); 5206 render_view_host->OnWebkitPreferencesChanged();
5207 } 5207 }
5208 5208
5209 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5209 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5210 JavaScriptDialogManager* dialog_manager) { 5210 JavaScriptDialogManager* dialog_manager) {
5211 dialog_manager_ = dialog_manager; 5211 dialog_manager_ = dialog_manager;
5212 } 5212 }
5213 5213
5214 } // namespace content 5214 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698