Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(660)

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_unittest.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698