| Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
|
| ===================================================================
|
| --- chrome/browser/ui/toolbar/wrench_menu_model.cc (revision 145001)
|
| +++ chrome/browser/ui/toolbar/wrench_menu_model.cc (working copy)
|
| @@ -27,6 +27,7 @@
|
| #include "chrome/browser/task_manager/task_manager.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_commands.h"
|
| +#include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/global_error/global_error.h"
|
| #include "chrome/browser/ui/global_error/global_error_service.h"
|
| @@ -110,7 +111,7 @@
|
| }
|
|
|
| bool EncodingMenuModel::IsCommandIdChecked(int command_id) const {
|
| - WebContents* current_tab = browser_->GetActiveWebContents();
|
| + WebContents* current_tab = chrome::GetActiveWebContents(browser_);
|
| if (!current_tab)
|
| return false;
|
| EncodingMenuController controller;
|
| @@ -612,8 +613,8 @@
|
| bool enable_increment = false;
|
| bool enable_decrement = false;
|
| int zoom_percent = 100;
|
| - if (browser_->GetActiveWebContents()) {
|
| - zoom_percent = browser_->GetActiveWebContents()->GetZoomPercent(
|
| + if (chrome::GetActiveWebContents(browser_)) {
|
| + zoom_percent = chrome::GetActiveWebContents(browser_)->GetZoomPercent(
|
| &enable_increment, &enable_decrement);
|
| }
|
| zoom_label_ = l10n_util::GetStringFUTF16(
|
|
|