Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/views/ash/app_list/search_builder.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/ash/app_list/search_builder.h"
 
 #include <string>
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/extension_app_provider.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/views/ash/extension_utils.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/search_result.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 204 matching lines @@
         GetExtensionByURL(profile_, match.destination_url);
     if (extension)
       extension_utils::OpenExtension(profile_, extension, event_flags);
   } else {
     WindowOpenDisposition disposition =
         browser::DispositionFromEventFlags(event_flags);
     Browser* browser = browser::FindOrCreateTabbedBrowser(profile_);
 
     if (disposition == CURRENT_TAB) {
       // If current tab is not NTP, change disposition to NEW_FOREGROUND_TAB.
-      const GURL& url = browser->GetActiveWebContents() ?
-          browser->GetActiveWebContents()->GetURL() : GURL();
+      const GURL& url = chrome::GetActiveWebContents(browser) ?
+          chrome::GetActiveWebContents(browser)->GetURL() : GURL();
       if (!url.SchemeIs(chrome::kChromeUIScheme) ||
           url.host() != chrome::kChromeUINewTabHost) {
         disposition = NEW_FOREGROUND_TAB;
       }
     }
 
     // TODO(xiyuan): What should we do for alternate url case?
     browser->OpenURL(
         content::OpenURLParams(match.destination_url,
                                content::Referrer(),
@@ skipping 10 matching lines @@
        ++it) {
     results_->Add(new SearchBuilderResult(profile_, *it));
   }
 }
 
 void SearchBuilder::OnResultChanged(bool default_match_changed) {
   // TODO(xiyuan): Handle default match properly.
   const AutocompleteResult& ac_result = controller_->result();
   PopulateFromACResult(ac_result);
 }