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

Side by Side Diff: chrome/browser/ui/views/location_bar/page_info_helper.cc

Issue 10827198: Change View::HitTest to View::HitTestRect (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed errors reported by trybots Created 8 years, 4 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 "chrome/browser/ui/views/location_bar/page_info_helper.h" 5 #include "chrome/browser/ui/views/location_bar/page_info_helper.h"
6 6
7 #include "chrome/browser/ui/omnibox/omnibox_view.h" 7 #include "chrome/browser/ui/omnibox/omnibox_view.h"
8 #include "chrome/browser/ui/tab_contents/tab_contents.h" 8 #include "chrome/browser/ui/tab_contents/tab_contents.h"
9 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 9 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
10 #include "content/public/browser/navigation_controller.h" 10 #include "content/public/browser/navigation_controller.h"
11 #include "content/public/browser/navigation_entry.h" 11 #include "content/public/browser/navigation_entry.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 #include "ui/views/view.h" 13 #include "ui/views/view.h"
14 14
15 using content::NavigationController; 15 using content::NavigationController;
16 using content::NavigationEntry; 16 using content::NavigationEntry;
17 using content::WebContents; 17 using content::WebContents;
18 18
19 PageInfoHelper::PageInfoHelper(const views::View* owner, 19 PageInfoHelper::PageInfoHelper(const views::View* owner,
20 LocationBarView* location_bar) 20 LocationBarView* location_bar)
21 : owner_(owner), 21 : owner_(owner),
22 location_bar_(location_bar) { 22 location_bar_(location_bar) {
23 } 23 }
24 24
25 void PageInfoHelper::ProcessEvent(const views::LocatedEvent& event) { 25 void PageInfoHelper::ProcessEvent(const views::LocatedEvent& event) {
26 if (!owner_->HitTest(event.location())) 26 if (!owner_->HitTestPoint(event.location()))
27 return; 27 return;
28 28
29 // Do not show page info if the user has been editing the location 29 // Do not show page info if the user has been editing the location
30 // bar, or the location bar is at the NTP. 30 // bar, or the location bar is at the NTP.
31 if (location_bar_->GetLocationEntry()->IsEditingOrEmpty()) 31 if (location_bar_->GetLocationEntry()->IsEditingOrEmpty())
32 return; 32 return;
33 33
34 WebContents* tab = location_bar_->GetTabContents()->web_contents(); 34 WebContents* tab = location_bar_->GetTabContents()->web_contents();
35 const NavigationController& controller = tab->GetController(); 35 const NavigationController& controller = tab->GetController();
36 NavigationEntry* nav_entry = controller.GetActiveEntry(); 36 NavigationEntry* nav_entry = controller.GetActiveEntry();
37 if (!nav_entry) { 37 if (!nav_entry) {
38 NOTREACHED(); 38 NOTREACHED();
39 return; 39 return;
40 } 40 }
41 41
42 location_bar_->delegate()->ShowPageInfo( 42 location_bar_->delegate()->ShowPageInfo(
43 tab, nav_entry->GetURL(), nav_entry->GetSSL(), true); 43 tab, nav_entry->GetURL(), nav_entry->GetSSL(), true);
44 } 44 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/page_action_image_view.cc ('k') | chrome/browser/ui/views/location_bar/star_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698