chrome/browser/ui/views/location_bar/click_handler.cc - Issue 9703099: Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9703099: Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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 | Annotate | Revision Log

Property Changes:

Deleted: svn:mergeinfo

OLD	NEW
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/click_handler.h"	5 #include "chrome/browser/ui/views/location_bar/click_handler.h"

6	6

	7 #include "chrome/browser/ui/browser.h"

7 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	8 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"	9 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

9 #include "content/public/browser/navigation_controller.h"	10 #include "content/public/browser/navigation_controller.h"

10 #include "content/public/browser/navigation_entry.h"	11 #include "content/public/browser/navigation_entry.h"

11 #include "content/public/browser/web_contents.h"	12 #include "content/public/browser/web_contents.h"

12 #include "ui/views/view.h"	13 #include "ui/views/view.h"

13	14

14 using content::NavigationController;	15 using content::NavigationController;

15 using content::NavigationEntry;	16 using content::NavigationEntry;

16 using content::WebContents;	17 using content::WebContents;

(...skipping 14 matching lines...) Expand all Loading...
31 return;	32 return;

32	33

33 WebContents* tab = location_bar_->GetTabContentsWrapper()->web_contents();	34 WebContents* tab = location_bar_->GetTabContentsWrapper()->web_contents();

34 const NavigationController& controller = tab->GetController();	35 const NavigationController& controller = tab->GetController();

35 NavigationEntry* nav_entry = controller.GetActiveEntry();	36 NavigationEntry* nav_entry = controller.GetActiveEntry();

36 if (!nav_entry) {	37 if (!nav_entry) {

37 NOTREACHED();	38 NOTREACHED();

38 return;	39 return;

39 }	40 }

40	41

41 location_bar_->delegate()->ShowPageInfo(	42 Browser* browser = Browser::GetBrowserForController(&controller, NULL);

42 tab, nav_entry->GetURL(), nav_entry->GetSSL(), true);	43 browser->ShowPageInfo(tab, nav_entry->GetURL(), nav_entry->GetSSL(), true);

43 }	44 }

OLD	NEW