chrome/browser/ui/toolbar/wrench_menu_model.cc - Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 8 years, 12 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 116109)

+++ chrome/browser/ui/toolbar/wrench_menu_model.cc (working copy)

@@ -57,6 +57,7 @@

#endif

using content::UserMetricsAction;

+using content::WebContents;

////////////////////////////////////////////////////////////////////////////////

// EncodingMenuModel

@@ -98,7 +99,7 @@

}

bool EncodingMenuModel::IsCommandIdChecked(int command_id) const {

- TabContents* current_tab = browser_->GetSelectedTabContents();

+ WebContents* current_tab = browser_->GetSelectedWebContents();

if (!current_tab)

return false;

EncodingMenuController controller;

@@ -590,8 +591,8 @@

bool enable_increment = false;

bool enable_decrement = false;

int zoom_percent = 100;

- if (browser_->GetSelectedTabContents()) {

- zoom_percent = browser_->GetSelectedTabContents()->GetZoomPercent(

+ if (browser_->GetSelectedWebContents()) {

+ zoom_percent = browser_->GetSelectedWebContents()->GetZoomPercent(

&enable_increment, &enable_decrement);

}

zoom_label_ = l10n_util::GetStringFUTF16(

« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc » ('j') | no next file with comments »