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

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

Issue 11418043: Remove TabContents from OmniboxEditController and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros Created 8 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 | Annotate | Revision Log
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"
9 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
10 #include "content/public/browser/navigation_controller.h" 9 #include "content/public/browser/navigation_controller.h"
11 #include "content/public/browser/navigation_entry.h" 10 #include "content/public/browser/navigation_entry.h"
12 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
13 #include "ui/views/view.h" 12 #include "ui/views/view.h"
14 13
15 using content::NavigationController; 14 using content::NavigationController;
16 using content::NavigationEntry; 15 using content::NavigationEntry;
17 using content::WebContents; 16 using content::WebContents;
18 17
19 PageInfoHelper::PageInfoHelper(const views::View* owner, 18 PageInfoHelper::PageInfoHelper(const views::View* owner,
20 LocationBarView* location_bar) 19 LocationBarView* location_bar)
21 : owner_(owner), 20 : owner_(owner),
22 location_bar_(location_bar) { 21 location_bar_(location_bar) {
23 } 22 }
24 23
25 void PageInfoHelper::ProcessEvent(const ui::LocatedEvent& event) { 24 void PageInfoHelper::ProcessEvent(const ui::LocatedEvent& event) {
26 if (!owner_->HitTestPoint(event.location())) 25 if (!owner_->HitTestPoint(event.location()))
27 return; 26 return;
28 27
29 // Do not show page info if the user has been editing the location 28 // Do not show page info if the user has been editing the location
30 // bar, or the location bar is at the NTP. 29 // bar, or the location bar is at the NTP.
31 if (location_bar_->GetLocationEntry()->IsEditingOrEmpty()) 30 if (location_bar_->GetLocationEntry()->IsEditingOrEmpty())
32 return; 31 return;
33 32
34 WebContents* tab = location_bar_->GetTabContents()->web_contents(); 33 WebContents* tab = location_bar_->GetWebContents();
35 const NavigationController& controller = tab->GetController(); 34 const NavigationController& controller = tab->GetController();
36 NavigationEntry* nav_entry = controller.GetActiveEntry(); 35 NavigationEntry* nav_entry = controller.GetActiveEntry();
37 if (!nav_entry) { 36 if (!nav_entry) {
38 NOTREACHED(); 37 NOTREACHED();
39 return; 38 return;
40 } 39 }
41 40
42 location_bar_->delegate()->ShowPageInfo( 41 location_bar_->delegate()->ShowPageInfo(
43 tab, nav_entry->GetURL(), nav_entry->GetSSL(), true); 42 tab, nav_entry->GetURL(), nav_entry->GetSSL(), true);
44 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698