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

Side by Side Diff: chrome/browser/ui/browser.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 | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/find_bar/find_bar_controller.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 1849 matching lines...) Expand 10 before | Expand all | Expand 10 after
1860 void Browser::ResizeDueToAutoResize(WebContents* source, 1860 void Browser::ResizeDueToAutoResize(WebContents* source,
1861 const gfx::Size& new_size) { 1861 const gfx::Size& new_size) {
1862 window_->ResizeDueToAutoResize(source, new_size); 1862 window_->ResizeDueToAutoResize(source, new_size);
1863 } 1863 }
1864 1864
1865 void Browser::FindReply(WebContents* web_contents, 1865 void Browser::FindReply(WebContents* web_contents,
1866 int request_id, 1866 int request_id,
1867 int number_of_matches, 1867 int number_of_matches,
1868 const gfx::Rect& selection_rect, 1868 const gfx::Rect& selection_rect,
1869 int active_match_ordinal, 1869 int active_match_ordinal,
1870 bool final_update) { 1870 bool final_update,
1871 bool was_frame_removal) {
1871 FindTabHelper* find_tab_helper = FindTabHelper::FromWebContents(web_contents); 1872 FindTabHelper* find_tab_helper = FindTabHelper::FromWebContents(web_contents);
1872 if (!find_tab_helper) 1873 if (!find_tab_helper)
1873 return; 1874 return;
1874 1875
1875 find_tab_helper->HandleFindReply(request_id, 1876 find_tab_helper->HandleFindReply(request_id, number_of_matches,
1876 number_of_matches, 1877 selection_rect, active_match_ordinal,
1877 selection_rect, 1878 final_update, was_frame_removal);
1878 active_match_ordinal,
1879 final_update);
1880 } 1879 }
1881 1880
1882 void Browser::RequestToLockMouse(WebContents* web_contents, 1881 void Browser::RequestToLockMouse(WebContents* web_contents,
1883 bool user_gesture, 1882 bool user_gesture,
1884 bool last_unlocked_by_target) { 1883 bool last_unlocked_by_target) {
1885 exclusive_access_manager_->mouse_lock_controller()->RequestToLockMouse( 1884 exclusive_access_manager_->mouse_lock_controller()->RequestToLockMouse(
1886 web_contents, user_gesture, last_unlocked_by_target); 1885 web_contents, user_gesture, last_unlocked_by_target);
1887 } 1886 }
1888 1887
1889 void Browser::LostMouseLock() { 1888 void Browser::LostMouseLock() {
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
2676 // new window later, thus we need to navigate the window now. 2675 // new window later, thus we need to navigate the window now.
2677 if (contents) { 2676 if (contents) {
2678 contents->web_contents()->GetController().LoadURL( 2677 contents->web_contents()->GetController().LoadURL(
2679 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, 2678 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK,
2680 std::string()); // No extra headers. 2679 std::string()); // No extra headers.
2681 } 2680 }
2682 } 2681 }
2683 2682
2684 return contents != NULL; 2683 return contents != NULL;
2685 } 2684 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/find_bar/find_bar_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698