diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 20:49:12 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 20:49:12 +0000 |
| commit | 617ee9611cebaccd41db63f5dbd2c1ca286d34e9 (patch) | |
| tree | f413420c03b33535f389dc1c9ca0d3f76c42b258 /chrome/browser/chrome_to_mobile_service.cc | |
| parent | f3b279e8b3551706b8c95d11a8b476d3e43a5dfa (diff) | |
| download | chromium_src-617ee9611cebaccd41db63f5dbd2c1ca286d34e9.zip chromium_src-617ee9611cebaccd41db63f5dbd2c1ca286d34e9.tar.gz chromium_src-617ee9611cebaccd41db63f5dbd2c1ca286d34e9.tar.bz2 | |
Remove TabStripModel wrapper use.
BUG=167548
TEST=no functional change
Review URL: https://chromiumcodereview.appspot.com/12051054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_to_mobile_service.cc')
| -rw-r--r-- | chrome/browser/chrome_to_mobile_service.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc index 5ccbd8e..edb7863 100644 --- a/chrome/browser/chrome_to_mobile_service.cc +++ b/chrome/browser/chrome_to_mobile_service.cc @@ -25,7 +25,7 @@ #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_navigator.h" -#include "chrome/browser/ui/browser_tabstrip.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/cloud_print/cloud_print_constants.h" @@ -238,8 +238,10 @@ bool ChromeToMobileService::UpdateAndGetCommandState(Browser* browser) { const ChromeToMobileService* service = ChromeToMobileServiceFactory::GetForProfile(browser->profile()); DCHECK(!browser->profile()->IsOffTheRecord() || !service); - enabled = service && service->HasMobiles() && - CanSendURL(chrome::GetActiveWebContents(browser)->GetURL()); + enabled = + service && service->HasMobiles() && + CanSendURL( + browser->tab_strip_model()->GetActiveWebContents()->GetURL()); } browser->command_controller()->command_updater()-> UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE, enabled); @@ -327,7 +329,8 @@ void ChromeToMobileService::SendToMobile(const base::DictionaryValue* mobile, data->mobile_os = (mobile_os.compare(kTypeAndroid) == 0) ? ANDROID : IOS; if (!mobile->GetString("id", &data->mobile_id)) NOTREACHED(); - content::WebContents* web_contents = chrome::GetActiveWebContents(browser); + content::WebContents* web_contents = + browser->tab_strip_model()->GetActiveWebContents(); DCHECK(CanSendURL(web_contents->GetURL())); data->url = web_contents->GetURL(); data->title = web_contents->GetTitle(); @@ -498,8 +501,9 @@ void ChromeToMobileService::SnapshotFileCreated( // Generate the snapshot and callback SnapshotGenerated, or signal failure. Browser* browser = chrome::FindBrowserWithID(browser_id); - if (!path.empty() && browser && chrome::GetActiveWebContents(browser)) { - chrome::GetActiveWebContents(browser)->GenerateMHTML(path, + if (!path.empty() && browser && + browser->tab_strip_model()->GetActiveWebContents()) { + browser->tab_strip_model()->GetActiveWebContents()->GenerateMHTML(path, base::Bind(&ChromeToMobileService::SnapshotGenerated, weak_ptr_factory_.GetWeakPtr(), observer)); } else { |