chrome/browser/ui/cocoa/applescript/window_applescript.mm - Issue 9085006: Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers.

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/applescript/window_applescript.mm

Issue 9085006: Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac yet again Created 8 years, 12 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/browser_tab_restore_service_delegate.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/applescript/window_applescript.mm

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

--- chrome/browser/ui/cocoa/applescript/window_applescript.mm (revision 116244)

+++ chrome/browser/ui/cocoa/applescript/window_applescript.mm (working copy)

@@ -21,7 +21,7 @@

#import "chrome/browser/ui/cocoa/applescript/tab_applescript.h"

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

#include "chrome/common/url_constants.h"

-#include "content/browser/tab_contents/tab_contents.h"

+#include "content/public/browser/web_contents.h"

@interface WindowAppleScript(WindowAppleScriptPrivateMethods)

// The NSWindow that corresponds to this window.

@@ -151,7 +151,7 @@

for (int i = 0; i < browser_->tab_count(); ++i) {

// Check to see if tab is closing.

- if (browser_->GetTabContentsAt(i)->IsBeingDestroyed()) {

+ if (browser_->GetWebContentsAt(i)->IsBeingDestroyed()) {

continue;

}

@@ -176,7 +176,7 @@

TabContentsWrapper* contents =

browser_->AddSelectedTabWithURL(GURL(chrome::kChromeUINewTabURL),

content::PAGE_TRANSITION_TYPED);

- contents->tab_contents()->SetNewTabStartTime(newTabStartTime);

+ contents->web_contents()->SetNewTabStartTime(newTabStartTime);

[aTab setTabContent:contents];

}

@@ -194,14 +194,14 @@

params.disposition = NEW_FOREGROUND_TAB;

params.tabstrip_index = index;

browser::Navigate(&params);

- params.target_contents->tab_contents()->SetNewTabStartTime(

+ params.target_contents->web_contents()->SetNewTabStartTime(

newTabStartTime);

[aTab setTabContent:params.target_contents];

}

- (void)removeFromTabsAtIndex:(int)index {

- browser_->CloseTabContents(browser_->GetTabContentsAt(index));

+ browser_->CloseTabContents(browser_->GetWebContentsAt(index));

}

- (NSNumber*)orderedIndex {