chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 10703131: Move Instant stuff off Browser.

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

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 10703131: Move Instant stuff off Browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 5 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:

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

===================================================================

--- chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (revision 145932)

+++ chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (working copy)

@@ -27,6 +27,7 @@

#include "chrome/browser/search_engines/template_url.h"

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

+#include "chrome/browser/ui/browser_instant_controller.h"

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

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

#import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"

@@ -319,7 +320,7 @@

}

InstantController* LocationBarViewMac::GetInstant() {

- return browser_->instant();

+ return browser_->instant_controller()->instant();

}

TabContents* LocationBarViewMac::GetTabContents() const {