diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 16:17:49 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 16:17:49 +0000 |
| commit | 3c9e187bd8ec34ebf2a91a37c868584c465647e8 (patch) | |
| tree | 84c9540d220fa155cf2af8c944638c0719dee670 /chrome/browser/cocoa/applescript | |
| parent | 3e35b224fd0c36f17f432f23e2eb3729667210b1 (diff) | |
| download | chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.zip chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.tar.gz chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.tar.bz2 | |
Make pink's TabContentsWrapper change compile on Windows.
Code by pinkerton@, with modifications by evanm and myself to get it to build on windows/linux/chromeos.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4694008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/applescript')
| -rw-r--r-- | chrome/browser/cocoa/applescript/window_applescript.mm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/applescript/window_applescript.mm b/chrome/browser/cocoa/applescript/window_applescript.mm index 7f5e6a5..631d52c 100644 --- a/chrome/browser/cocoa/applescript/window_applescript.mm +++ b/chrome/browser/cocoa/applescript/window_applescript.mm @@ -18,6 +18,7 @@ #import "chrome/browser/cocoa/applescript/tab_applescript.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/url_constants.h" @@ -170,16 +171,16 @@ // Set how long it takes a tab to be created. base::TimeTicks newTabStartTime = base::TimeTicks::Now(); - TabContents* contents = + TabContentsWrapper* contents = browser_->AddSelectedTabWithURL(GURL(chrome::kChromeUINewTabURL), PageTransition::TYPED); - contents->set_new_tab_start_time(newTabStartTime); - - [aTab setTabContent:contents]; + contents->tab_contents()->set_new_tab_start_time(newTabStartTime); + [aTab setTabContent:contents->tab_contents()]; } - (void)insertInTabs:(TabAppleScript*)aTab atIndex:(int)index { // This method gets called when a new tab is created so + // This method gets called when a new tab is created so // the container and property are set here. [aTab setContainer:self property:AppleScript::kTabsProperty]; @@ -192,9 +193,10 @@ params.disposition = NEW_FOREGROUND_TAB; params.tabstrip_index = index; browser::Navigate(¶ms); - params.target_contents->set_new_tab_start_time(newTabStartTime); + params.target_contents->tab_contents()->set_new_tab_start_time( + newTabStartTime); - [aTab setTabContent:params.target_contents]; + [aTab setTabContent:params.target_contents->tab_contents()]; } - (void)removeFromTabsAtIndex:(int)index { |
