From c840d52c54743d3353e90136fe17b8c697083d25 Mon Sep 17 00:00:00 2001
From: "rickcam@chromium.org"
<rickcam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 21 Dec 2010 00:58:34 +0000
Subject: [PATCH] Cleaning up some issues discovered in a semi-related code
review.
BUG=67206
TEST=manual
Review URL: http://codereview.chromium.org/5858004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69778 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/browser/background_mode_manager.cc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc
index 290eed9d9d95b..c3ffdef1392d2 100644
--- a/chrome/browser/background_mode_manager.cc
+++ b/chrome/browser/background_mode_manager.cc
@@ -277,16 +277,15 @@ void BackgroundModeManager::UpdateStatusTrayIconContextMenu() {
menu->AddItem(IDC_OPTIONS, GetPreferencesMenuLabel());
menu->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
menu->AddSeparator();
- int application_position = 0;
+ int position = 0;
context_menu_application_offset_ = menu->GetItemCount();
for (ExtensionList::const_iterator cursor = applications_.begin();
cursor != applications_.end();
- ++cursor, ++application_position) {
+ ++cursor, ++position) {
const SkBitmap* icon = applications_.GetIcon(*cursor);
- int sort_position = applications_.GetPosition(*cursor);
- DCHECK(sort_position == application_position);
+ DCHECK(position == applications_.GetPosition(*cursor));
const std::string& name = (*cursor)->name();
- menu->AddItem(sort_position, ASCIIToUTF16(name));
+ menu->AddItem(position, UTF8ToUTF16(name));
if (icon)
menu->SetIcon(menu->GetItemCount() - 1, *icon);
}
--
GitLab