chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

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 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm ('k') | chrome/browser/ui/cocoa/tabpose_window_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

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

@@ -28,6 +28,7 @@

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

#include "chrome/browser/search_engines/template_url_service_factory.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"

#include "chrome/browser/ui/cocoa/event_utils.h"

#import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"

@@ -322,7 +323,7 @@

}

TabContents* LocationBarViewMac::GetTabContents() const {

- return browser_->GetActiveTabContents();

+ return chrome::GetActiveTabContents(browser_);

}

void LocationBarViewMac::Revert() {

@@ -356,7 +357,7 @@

}

WebContents* LocationBarViewMac::GetWebContents() const {

- return browser_->GetActiveWebContents();

+ return chrome::GetActiveWebContents(browser_);

}

PageActionDecoration* LocationBarViewMac::GetPageActionDecoration(

@@ -574,7 +575,7 @@

bool LocationBarViewMac::RefreshContentSettingsDecorations() {

const bool input_in_progress = toolbar_model_->input_in_progress();

WebContents* web_contents =

- input_in_progress ? NULL : browser_->GetActiveWebContents();

+ input_in_progress ? NULL : chrome::GetActiveWebContents(browser_);

bool icons_updated = false;

for (size_t i = 0; i < content_setting_decorations_.size(); ++i) {

icons_updated |=