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

Side by Side Diff: chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 5711001: Add a new GetInstance() method for remaining files with singleton classes under chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 294
295 return browser_->command_updater()->IsCommandEnabled(command_id); 295 return browser_->command_updater()->IsCommandEnabled(command_id);
296 } 296 }
297 297
298 bool WrenchMenuModel::IsCommandIdVisible(int command_id) const { 298 bool WrenchMenuModel::IsCommandIdVisible(int command_id) const {
299 if (command_id == IDC_UPGRADE_DIALOG) { 299 if (command_id == IDC_UPGRADE_DIALOG) {
300 #if defined(OS_CHROMEOS) 300 #if defined(OS_CHROMEOS)
301 return (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->status().status 301 return (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->status().status
302 == chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT); 302 == chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT);
303 #else 303 #else
304 return Singleton<UpgradeDetector>::get()->notify_upgrade(); 304 return UpgradeDetector::GetInstance()->notify_upgrade();
305 #endif 305 #endif
306 } else if (command_id == IDC_VIEW_INCOMPATIBILITIES) { 306 } else if (command_id == IDC_VIEW_INCOMPATIBILITIES) {
307 #if defined(OS_WIN) 307 #if defined(OS_WIN)
308 EnumerateModulesModel* loaded_modules = 308 EnumerateModulesModel* loaded_modules =
309 EnumerateModulesModel::GetSingleton(); 309 EnumerateModulesModel::GetSingleton();
310 return loaded_modules->confirmed_bad_modules_detected() > 0; 310 return loaded_modules->confirmed_bad_modules_detected() > 0;
311 #else 311 #else
312 return false; 312 return false;
313 #endif 313 #endif
314 } else if (command_id == IDC_VIEW_BACKGROUND_PAGES) { 314 } else if (command_id == IDC_VIEW_BACKGROUND_PAGES) {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 &enable_increment, &enable_decrement); 530 &enable_increment, &enable_decrement);
531 } 531 }
532 zoom_label_ = l10n_util::GetStringFUTF16( 532 zoom_label_ = l10n_util::GetStringFUTF16(
533 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 533 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
534 } 534 }
535 535
536 string16 WrenchMenuModel::GetSyncMenuLabel() const { 536 string16 WrenchMenuModel::GetSyncMenuLabel() const {
537 return sync_ui_util::GetSyncMenuLabel( 537 return sync_ui_util::GetSyncMenuLabel(
538 browser_->profile()->GetOriginalProfile()->GetProfileSyncService()); 538 browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
539 } 539 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698