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

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

Issue 378233002: [Android] Extend smart clip to return html along with text (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: avoid build breakage Created 6 years, 5 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/renderer_host/render_widget_host_view_android.h" 5 #include "content/browser/renderer_host/render_widget_host_view_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 needs_begin_frame_ = enabled; 541 needs_begin_frame_ = enabled;
542 } 542 }
543 543
544 void RenderWidgetHostViewAndroid::OnStartContentIntent( 544 void RenderWidgetHostViewAndroid::OnStartContentIntent(
545 const GURL& content_url) { 545 const GURL& content_url) {
546 if (content_view_core_) 546 if (content_view_core_)
547 content_view_core_->StartContentIntent(content_url); 547 content_view_core_->StartContentIntent(content_url);
548 } 548 }
549 549
550 void RenderWidgetHostViewAndroid::OnSmartClipDataExtracted( 550 void RenderWidgetHostViewAndroid::OnSmartClipDataExtracted(
551 const base::string16& result, 551 const base::string16& text,
552 const base::string16& html,
552 const gfx::Rect rect) { 553 const gfx::Rect rect) {
553 if (content_view_core_) 554 if (content_view_core_)
554 content_view_core_->OnSmartClipDataExtracted(rect, result); 555 content_view_core_->OnSmartClipDataExtracted(text, html, rect);
555 } 556 }
556 557
557 bool RenderWidgetHostViewAndroid::OnTouchEvent( 558 bool RenderWidgetHostViewAndroid::OnTouchEvent(
558 const ui::MotionEvent& event) { 559 const ui::MotionEvent& event) {
559 if (!host_) 560 if (!host_)
560 return false; 561 return false;
561 562
562 if (!gesture_provider_.OnTouchEvent(event)) 563 if (!gesture_provider_.OnTouchEvent(event))
563 return false; 564 return false;
564 565
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 results->orientationAngle = display.RotationAsDegree(); 1483 results->orientationAngle = display.RotationAsDegree();
1483 results->orientationType = 1484 results->orientationType =
1484 RenderWidgetHostViewBase::GetOrientationTypeForMobile(display); 1485 RenderWidgetHostViewBase::GetOrientationTypeForMobile(display);
1485 gfx::DeviceDisplayInfo info; 1486 gfx::DeviceDisplayInfo info;
1486 results->depth = info.GetBitsPerPixel(); 1487 results->depth = info.GetBitsPerPixel();
1487 results->depthPerComponent = info.GetBitsPerComponent(); 1488 results->depthPerComponent = info.GetBitsPerComponent();
1488 results->isMonochrome = (results->depthPerComponent == 0); 1489 results->isMonochrome = (results->depthPerComponent == 0);
1489 } 1490 }
1490 1491
1491 } // namespace content 1492 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_android.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698