Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h"
 
 #include "base/logging.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #import "chrome/browser/app_controller_mac.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/applescript/constants_applescript.h"
 #include "chrome/browser/ui/cocoa/applescript/error_applescript.h"
 #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 
 @interface WindowAppleScript(WindowAppleScriptPrivateMethods)
@@ skipping 82 matching lines @@
   if (!activeTabIndex) {
     return nil;
   }
   return [NSNumber numberWithInt:activeTabIndex];
 }
 
 - (void)setActiveTabIndex:(NSNumber*)anActiveTabIndex {
   // Note: applescript is 1-based, that is lists begin with index 1.
   int atIndex = [anActiveTabIndex intValue] - 1;
   if (atIndex >= 0 && atIndex < browser_->tab_count())
-    browser_->ActivateTabAt(atIndex, true);
+    chrome::ActivateTabAt(browser_, atIndex, true);
   else
     AppleScript::SetError(AppleScript::errInvalidTabIndex);
 }
 
 - (NSString*)mode {
   Profile* profile = browser_->profile();
   if (profile->IsOffTheRecord())
     return AppleScript::kIncognitoWindowMode;
   return AppleScript::kNormalWindowMode;
 }
 
 - (void)setMode:(NSString*)theMode {
   // cannot set mode after window is created.
   if (theMode) {
     AppleScript::SetError(AppleScript::errSetMode);
   }
 }
 
 - (TabAppleScript*)activeTab {
   TabAppleScript* currentTab =
       [[[TabAppleScript alloc]
-          initWithTabContent:browser_->GetActiveTabContents()]
+          initWithTabContent:chrome::GetActiveTabContents(browser_)]
               autorelease];
   [currentTab setContainer:self
                   property:AppleScript::kTabsProperty];
   return currentTab;
 }
 
 - (NSArray*)tabs {
   NSMutableArray* tabs = [NSMutableArray
       arrayWithCapacity:browser_->tab_count()];
 
   for (int i = 0; i < browser_->tab_count(); ++i) {
     // Check to see if tab is closing.
-    TabContents* tab_contents = browser_->GetTabContentsAt(i);
+    TabContents* tab_contents = chrome::GetTabContentsAt(browser_, i);
     if (tab_contents->in_destructor()) {
       continue;
     }
 
     scoped_nsobject<TabAppleScript> tab(
         [[TabAppleScript alloc] initWithTabContent:tab_contents]);
     [tab setContainer:self
              property:AppleScript::kTabsProperty];
     [tabs addObject:tab];
   }
   return tabs;
 }
 
 - (void)insertInTabs:(TabAppleScript*)aTab {
   // This method gets called when a new tab is created so
   // the container and property are set here.
   [aTab setContainer:self
             property:AppleScript::kTabsProperty];
 
   // Set how long it takes a tab to be created.
   base::TimeTicks newTabStartTime = base::TimeTicks::Now();
-  TabContents* contents =
-      browser_->AddSelectedTabWithURL(GURL(chrome::kChromeUINewTabURL),
-                                      content::PAGE_TRANSITION_TYPED);
+  TabContents* contents = chrome::AddSelectedTabWithURL(
+      browser_,
+      GURL(chrome::kChromeUINewTabURL),
+      content::PAGE_TRANSITION_TYPED);
   contents->web_contents()->SetNewTabStartTime(newTabStartTime);
   [aTab setTabContent:contents];
 }
 
 - (void)insertInTabs:(TabAppleScript*)aTab atIndex:(int)index {
   // This method gets called when a new tab is created so
   // the container and property are set here.
   [aTab setContainer:self
             property:AppleScript::kTabsProperty];
 
   // Set how long it takes a tab to be created.
   base::TimeTicks newTabStartTime = base::TimeTicks::Now();
   browser::NavigateParams params(browser_,
                                  GURL(chrome::kChromeUINewTabURL),
                                  content::PAGE_TRANSITION_TYPED);
   params.disposition = NEW_FOREGROUND_TAB;
   params.tabstrip_index = index;
   browser::Navigate(&params);
   params.target_contents->web_contents()->SetNewTabStartTime(
       newTabStartTime);
 
   [aTab setTabContent:params.target_contents];
 }
 
 - (void)removeFromTabsAtIndex:(int)index {
-  browser_->CloseTabContents(browser_->GetWebContentsAt(index));
+  chrome::CloseWebContents(browser_, chrome::GetWebContentsAt(browser_, index));
 }
 
 - (NSNumber*)orderedIndex {
   return [NSNumber numberWithInt:[[self nativeHandle] orderedIndex]];
 }
 
 - (void)setOrderedIndex:(NSNumber*)anIndex {
   int index = [anIndex intValue] - 1;
   if (index < 0 || index >= (int)BrowserList::size()) {
     AppleScript::SetError(AppleScript::errWrongIndex);
@@ skipping 42 matching lines @@
         GURL(), FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION);
   }
 }
 
 - (void)handlesExitPresentationMode:(NSScriptCommand*)command {
   if (browser_->window())
     browser_->window()->ExitPresentationMode();
 }
 
 @end