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

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

Issue 11098054: Removing webkit diff with Android tree (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 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 | « no previous file | webkit/media/android/audio_decoder_android.cc » ('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 (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_android.h" 5 #include "content/browser/renderer_host/render_widget_host_view_android.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 } 447 }
448 448
449 void RenderWidgetHostViewAndroid::DidSetNeedTouchEvents( 449 void RenderWidgetHostViewAndroid::DidSetNeedTouchEvents(
450 bool need_touch_events) { 450 bool need_touch_events) {
451 if (content_view_core_) 451 if (content_view_core_)
452 content_view_core_->DidSetNeedTouchEvents(need_touch_events); 452 content_view_core_->DidSetNeedTouchEvents(need_touch_events);
453 } 453 }
454 454
455 // static 455 // static
456 void RenderWidgetHostViewPort::GetDefaultScreenInfo( 456 void RenderWidgetHostViewPort::GetDefaultScreenInfo(
457 ::WebKit::WebScreenInfo* results) { 457 WebKit::WebScreenInfo* results) {
458 DeviceInfo info; 458 DeviceInfo info;
459 const int width = info.GetWidth(); 459 const int width = info.GetWidth();
460 const int height = info.GetHeight(); 460 const int height = info.GetHeight();
461 results->horizontalDPI = 160 * info.GetDPIScale(); 461 results->horizontalDPI = 160 * info.GetDPIScale();
462 results->verticalDPI = 160 * info.GetDPIScale(); 462 results->verticalDPI = 160 * info.GetDPIScale();
463 results->depth = info.GetBitsPerPixel(); 463 results->depth = info.GetBitsPerPixel();
464 results->depthPerComponent = info.GetBitsPerComponent(); 464 results->depthPerComponent = info.GetBitsPerComponent();
465 results->isMonochrome = (results->depthPerComponent == 0); 465 results->isMonochrome = (results->depthPerComponent == 0);
466 results->rect = ::WebKit::WebRect(0, 0, width, height); 466 results->rect = WebKit::WebRect(0, 0, width, height);
467 // TODO(husky): Remove any system controls from availableRect. 467 // TODO(husky): Remove any system controls from availableRect.
468 results->availableRect = ::WebKit::WebRect(0, 0, width, height); 468 results->availableRect = WebKit::WebRect(0, 0, width, height);
469 } 469 }
470 470
471 //////////////////////////////////////////////////////////////////////////////// 471 ////////////////////////////////////////////////////////////////////////////////
472 // RenderWidgetHostView, public: 472 // RenderWidgetHostView, public:
473 473
474 // static 474 // static
475 RenderWidgetHostView* 475 RenderWidgetHostView*
476 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { 476 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
477 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); 477 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
478 return new RenderWidgetHostViewAndroid(rwhi, NULL); 478 return new RenderWidgetHostViewAndroid(rwhi, NULL);
479 } 479 }
480 480
481 } // namespace content 481 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | webkit/media/android/audio_decoder_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698