Clean-up BackgroundModeManager-BackgroundApplicationListModel interaction

chrome/browser/background_mode_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 259 matching lines @@
     return;
 
   // Create a context menu item for Chrome.
   menus::SimpleMenuModel* menu = new menus::SimpleMenuModel(this);
   // Add About item
   menu->AddItem(IDC_ABOUT, l10n_util::GetStringFUTF16(IDS_ABOUT,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   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));

[Andrew T Wilson (Slow), 2010/12/17 01:56:22]

LGTM.

     if (icon)
       menu->SetIcon(menu->GetItemCount() - 1, *icon);
   }
   if (applications_.size() > 0)
     menu->AddSeparator();
   menu->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
   context_menu_ = menu;
   status_icon_->SetContextMenu(menu);
 }
 
@@ skipping 72 matching lines @@
 #if !defined(OS_WIN)
   // BackgroundMode is enabled by default on windows. On other platforms, it
   // is enabled via about:flags.
   background_mode_enabled = background_mode_enabled &&
       command_line->HasSwitch(switches::kEnableBackgroundMode);
 #endif
 
   return background_mode_enabled;
 }