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

Side by Side Diff: extensions/browser/guest_view/web_view/web_view_guest.cc

Issue 2723253002: Fix beep when navigating/closing a page with find bar open
Patch Set: android Created 3 years, 9 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 | « extensions/browser/guest_view/web_view/web_view_guest.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/browser/guest_view/web_view/web_view_guest.h" 5 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 std::unique_ptr<base::DictionaryValue> args(new base::DictionaryValue()); 576 std::unique_ptr<base::DictionaryValue> args(new base::DictionaryValue());
577 DispatchEventToView( 577 DispatchEventToView(
578 base::MakeUnique<GuestViewEvent>(webview::kEventClose, std::move(args))); 578 base::MakeUnique<GuestViewEvent>(webview::kEventClose, std::move(args)));
579 } 579 }
580 580
581 void WebViewGuest::FindReply(WebContents* source, 581 void WebViewGuest::FindReply(WebContents* source,
582 int request_id, 582 int request_id,
583 int number_of_matches, 583 int number_of_matches,
584 const gfx::Rect& selection_rect, 584 const gfx::Rect& selection_rect,
585 int active_match_ordinal, 585 int active_match_ordinal,
586 bool final_update) { 586 bool final_update,
587 bool was_frame_removal) {
587 GuestViewBase::FindReply(source, request_id, number_of_matches, 588 GuestViewBase::FindReply(source, request_id, number_of_matches,
588 selection_rect, active_match_ordinal, final_update); 589 selection_rect, active_match_ordinal, final_update,
590 was_frame_removal);
589 find_helper_.FindReply(request_id, number_of_matches, selection_rect, 591 find_helper_.FindReply(request_id, number_of_matches, selection_rect,
590 active_match_ordinal, final_update); 592 active_match_ordinal, final_update);
591 } 593 }
592 594
593 double WebViewGuest::GetZoom() const { 595 double WebViewGuest::GetZoom() const {
594 double zoom_level = 596 double zoom_level =
595 ZoomController::FromWebContents(web_contents())->GetZoomLevel(); 597 ZoomController::FromWebContents(web_contents())->GetZoomLevel();
596 return ConvertZoomLevelToZoomFactor(zoom_level); 598 return ConvertZoomLevelToZoomFactor(zoom_level);
597 } 599 }
598 600
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1559 std::unique_ptr<base::DictionaryValue> args(new base::DictionaryValue()); 1561 std::unique_ptr<base::DictionaryValue> args(new base::DictionaryValue());
1560 DispatchEventToView(base::MakeUnique<GuestViewEvent>( 1562 DispatchEventToView(base::MakeUnique<GuestViewEvent>(
1561 webview::kEventExitFullscreen, std::move(args))); 1563 webview::kEventExitFullscreen, std::move(args)));
1562 } 1564 }
1563 // Since we changed fullscreen state, sending a Resize message ensures that 1565 // Since we changed fullscreen state, sending a Resize message ensures that
1564 // renderer/ sees the change. 1566 // renderer/ sees the change.
1565 web_contents()->GetRenderViewHost()->GetWidget()->WasResized(); 1567 web_contents()->GetRenderViewHost()->GetWidget()->WasResized();
1566 } 1568 }
1567 1569
1568 } // namespace extensions 1570 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/guest_view/web_view/web_view_guest.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698