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

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

Issue 4694008: Make pink's TabContentsWrapper change compile on Windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/views/location_bar/click_handler.h" 5 #include "chrome/browser/views/location_bar/click_handler.h"
6 6
7 #include "chrome/browser/tab_contents/navigation_controller.h" 7 #include "chrome/browser/tab_contents/navigation_controller.h"
8 #include "chrome/browser/tab_contents/tab_contents.h" 8 #include "chrome/browser/tab_contents/tab_contents.h"
9 #include "chrome/browser/tab_contents_wrapper.h"
9 #include "chrome/browser/views/location_bar/location_bar_view.h" 10 #include "chrome/browser/views/location_bar/location_bar_view.h"
10 #include "views/view.h" 11 #include "views/view.h"
11 12
12 ClickHandler::ClickHandler(const views::View* owner, 13 ClickHandler::ClickHandler(const views::View* owner,
13 const LocationBarView* location_bar) 14 const LocationBarView* location_bar)
14 : owner_(owner), 15 : owner_(owner),
15 location_bar_(location_bar) { 16 location_bar_(location_bar) {
16 } 17 }
17 18
18 void ClickHandler::OnMouseReleased(const views::MouseEvent& event, 19 void ClickHandler::OnMouseReleased(const views::MouseEvent& event,
19 bool canceled) { 20 bool canceled) {
20 if (canceled || !owner_->HitTest(event.location())) 21 if (canceled || !owner_->HitTest(event.location()))
21 return; 22 return;
22 23
23 // Do not show page info if the user has been editing the location 24 // Do not show page info if the user has been editing the location
24 // bar, or the location bar is at the NTP. 25 // bar, or the location bar is at the NTP.
25 if (location_bar_->location_entry()->IsEditingOrEmpty()) 26 if (location_bar_->location_entry()->IsEditingOrEmpty())
26 return; 27 return;
27 28
28 TabContents* tab = location_bar_->GetTabContents(); 29 TabContents* tab = location_bar_->GetTabContentsWrapper()->tab_contents();
29 NavigationEntry* nav_entry = tab->controller().GetActiveEntry(); 30 NavigationEntry* nav_entry = tab->controller().GetActiveEntry();
30 if (!nav_entry) { 31 if (!nav_entry) {
31 NOTREACHED(); 32 NOTREACHED();
32 return; 33 return;
33 } 34 }
34 tab->ShowPageInfo(nav_entry->url(), nav_entry->ssl(), true); 35 tab->ShowPageInfo(nav_entry->url(), nav_entry->ssl(), true);
35 } 36 }
36 37
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698