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

Side by Side Diff: chrome/browser/ui/views/find_bar_host.cc

Issue 739993002: MacViews: Fix build errors related to NativeWebKeyboardEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 "chrome/browser/ui/views/find_bar_host.h" 5 #include "chrome/browser/ui/views/find_bar_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 9 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
10 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 10 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 content::WebContents* contents = find_bar_controller_->web_contents(); 64 content::WebContents* contents = find_bar_controller_->web_contents();
65 if (!contents) 65 if (!contents)
66 return false; 66 return false;
67 67
68 content::RenderViewHost* render_view_host = contents->GetRenderViewHost(); 68 content::RenderViewHost* render_view_host = contents->GetRenderViewHost();
69 69
70 // Make sure we don't have a text field element interfering with keyboard 70 // Make sure we don't have a text field element interfering with keyboard
71 // input. Otherwise Up and Down arrow key strokes get eaten. "Nom Nom Nom". 71 // input. Otherwise Up and Down arrow key strokes get eaten. "Nom Nom Nom".
72 render_view_host->ClearFocusedElement(); 72 render_view_host->ClearFocusedElement();
73 NativeWebKeyboardEvent event = GetKeyboardEvent(contents, key_event); 73 NativeWebKeyboardEvent event(key_event);
sadrul 2014/11/21 19:33:42 Looks like you can remove DropdownBarHost::GetKeyb
Andre 2014/11/22 00:09:58 Yes, I removed it.
74 render_view_host->ForwardKeyboardEvent(event); 74 render_view_host->ForwardKeyboardEvent(event);
75 return true; 75 return true;
76 } 76 }
77 77
78 FindBarController* FindBarHost::GetFindBarController() const { 78 FindBarController* FindBarHost::GetFindBarController() const {
79 return find_bar_controller_; 79 return find_bar_controller_;
80 } 80 }
81 81
82 void FindBarHost::SetFindBarController(FindBarController* find_bar_controller) { 82 void FindBarHost::SetFindBarController(FindBarController* find_bar_controller) {
83 find_bar_controller_ = find_bar_controller; 83 find_bar_controller_ = find_bar_controller;
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 358
359 //////////////////////////////////////////////////////////////////////////////// 359 ////////////////////////////////////////////////////////////////////////////////
360 // private: 360 // private:
361 361
362 void FindBarHost::GetWidgetPositionNative(gfx::Rect* avoid_overlapping_rect) { 362 void FindBarHost::GetWidgetPositionNative(gfx::Rect* avoid_overlapping_rect) {
363 gfx::Rect frame_rect = host()->GetTopLevelWidget()->GetWindowBoundsInScreen(); 363 gfx::Rect frame_rect = host()->GetTopLevelWidget()->GetWindowBoundsInScreen();
364 gfx::Rect webcontents_rect = 364 gfx::Rect webcontents_rect =
365 find_bar_controller_->web_contents()->GetViewBounds(); 365 find_bar_controller_->web_contents()->GetViewBounds();
366 avoid_overlapping_rect->Offset(0, webcontents_rect.y() - frame_rect.y()); 366 avoid_overlapping_rect->Offset(0, webcontents_rect.y() - frame_rect.y());
367 } 367 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698