Rename all methods accessing Singleton<T> as GetInstance().

chrome/browser/ui/toolbar/wrench_menu_model.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 "chrome/browser/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "app/l10n_util.h"
@@ skipping 44 matching lines @@
 #if defined(OS_WIN)
 #include "chrome/browser/enumerate_modules_model_win.h"
 #endif
 
 // The size of the font used for dynamic text overlays on menu items.
 const float kMenuBadgeFontSize = 12.0;
 
 namespace {
 SkBitmap GetBackgroundPageIcon() {
   string16 pages = base::FormatNumber(
-      BackgroundPageTracker::GetSingleton()->GetBackgroundPageCount());
+      BackgroundPageTracker::GetInstance()->GetBackgroundPageCount());
   return badge_util::DrawBadgeIconOverlay(
       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_BACKGROUND_MENU),
       kMenuBadgeFontSize,
       pages,
       l10n_util::GetStringUTF16(IDS_BACKGROUND_PAGE_BADGE_OVERFLOW));
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 178 matching lines @@
     case IDC_FULLSCREEN: {
       int string_id = IDS_ENTER_FULLSCREEN_MAC;  // Default to Enter.
       // Note: On startup, |window()| may be NULL.
       if (browser_->window() && browser_->window()->IsFullscreen())
         string_id = IDS_EXIT_FULLSCREEN_MAC;
       return l10n_util::GetStringUTF16(string_id);
     }
 #endif
     case IDC_VIEW_BACKGROUND_PAGES: {
       string16 num_background_pages = base::FormatNumber(
-          BackgroundPageTracker::GetSingleton()->GetBackgroundPageCount());
+          BackgroundPageTracker::GetInstance()->GetBackgroundPageCount());
       return l10n_util::GetStringFUTF16(IDS_VIEW_BACKGROUND_PAGES,
                                         num_background_pages);
     }
     default:
       NOTREACHED();
       return string16();
   }
 }
 
 void WrenchMenuModel::ExecuteCommand(int command_id) {
@@ skipping 24 matching lines @@
   if (command_id == IDC_UPGRADE_DIALOG) {
 #if defined(OS_CHROMEOS)
     return (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->status().status
             == chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT);
 #else
     return UpgradeDetector::GetInstance()->notify_upgrade();
 #endif
   } else if (command_id == IDC_VIEW_INCOMPATIBILITIES) {
 #if defined(OS_WIN)
     EnumerateModulesModel* loaded_modules =
-        EnumerateModulesModel::GetSingleton();
+        EnumerateModulesModel::GetInstance();
     return loaded_modules->confirmed_bad_modules_detected() > 0;
 #else
     return false;
 #endif
   } else if (command_id == IDC_VIEW_BACKGROUND_PAGES) {
-    BackgroundPageTracker* tracker = BackgroundPageTracker::GetSingleton();
+    BackgroundPageTracker* tracker = BackgroundPageTracker::GetInstance();
     return tracker->GetBackgroundPageCount() > 0;
   }
   return true;
 }
 
 bool WrenchMenuModel::GetAcceleratorForCommandId(
       int command_id,
       menus::Accelerator* accelerator) {
   return provider_->GetAcceleratorForCommandId(command_id, accelerator);
 }
@@ skipping 18 matching lines @@
   // it is the opposite in gtk land.
   tabstrip_model_->RemoveObserver(this);
   tabstrip_model_ = NULL;
 }
 
 void WrenchMenuModel::Observe(NotificationType type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::BACKGROUND_PAGE_TRACKER_CHANGED: {
-      int num_pages = BackgroundPageTracker::GetSingleton()->
+      int num_pages = BackgroundPageTracker::GetInstance()->
           GetUnacknowledgedBackgroundPageCount();
       if (num_pages > 0) {
         SetIcon(GetIndexOfCommandId(IDC_VIEW_BACKGROUND_PAGES),
                 GetBackgroundPageIcon());
       } else {
         // Just set a blank icon (no icon).
         SetIcon(GetIndexOfCommandId(IDC_VIEW_BACKGROUND_PAGES), SkBitmap());
       }
       break;
     }
@@ skipping 94 matching lines @@
   const string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
 #else
   const string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
 #endif
   // On Mac, there is no About item.
   if (browser_defaults::kShowAboutMenuItem) {
     AddItem(IDC_ABOUT, l10n_util::GetStringFUTF16(
         IDS_ABOUT, product_name));
   }
   string16 num_background_pages = base::FormatNumber(
-      BackgroundPageTracker::GetSingleton()->GetBackgroundPageCount());
+      BackgroundPageTracker::GetInstance()->GetBackgroundPageCount());
   AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16(
       IDS_VIEW_BACKGROUND_PAGES, num_background_pages));
   AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringFUTF16(
       IDS_UPDATE_NOW, product_name));
   AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16(
       IDS_VIEW_INCOMPATIBILITIES));
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SetIcon(GetIndexOfCommandId(IDC_UPGRADE_DIALOG),
           *rb.GetBitmapNamed(IDR_UPDATE_MENU));
 #if defined(OS_WIN)
   SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES),
           *rb.GetBitmapNamed(IDR_CONFLICT_MENU));
 #endif
 
   // Add an icon to the View Background Pages item if there are unacknowledged
   // pages.
-  if (BackgroundPageTracker::GetSingleton()->
+  if (BackgroundPageTracker::GetInstance()->
       GetUnacknowledgedBackgroundPageCount() > 0) {
     SetIcon(GetIndexOfCommandId(IDC_VIEW_BACKGROUND_PAGES),
             GetBackgroundPageIcon());
   }
 
   AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   if (browser_defaults::kShowExitMenuItem) {
     AddSeparator();
 #if defined(OS_CHROMEOS)
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
@@ skipping 32 matching lines @@
         &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   return sync_ui_util::GetSyncMenuLabel(
       browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
 }