Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/views/frame/browser_frame_win.cc

 // 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.
 
 #include "chrome/browser/ui/views/frame/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <set>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/metro.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #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_commands.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/system_menu_model.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 495 matching lines @@
       reinterpret_cast<base::win::CurrentTabInfo*>(w_param);
 
   Browser* browser = browser_view()->browser();
   DCHECK(browser);
 
   // We allocate memory for the title and url via LocalAlloc. The caller has to
   // free the memory via LocalFree.
   current_tab_info->title = base::win::LocalAllocAndCopyString(
       browser->GetWindowTitleForCurrentTab());
 
-  WebContents* current_tab = browser->GetActiveWebContents();
+  WebContents* current_tab = chrome::GetActiveWebContents(browser);
   DCHECK(current_tab);
 
   current_tab_info->url = base::win::LocalAllocAndCopyString(
       UTF8ToWide(current_tab->GetURL().spec()));
 }
 
 void BrowserFrameWin::CacheMinimizeButtonDelta() {
   int minimize_offset = GetMinimizeButtonOffsetForWindow(GetNativeView());
   if (!minimize_offset)
     return;
@@ skipping 23 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameWin(browser_frame, browser_view);
 }