| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/signin/signin_manager.h" | 21 #include "chrome/browser/signin/signin_manager.h" |
| 22 #include "chrome/browser/signin/signin_manager_factory.h" | 22 #include "chrome/browser/signin/signin_manager_factory.h" |
| 23 #include "chrome/browser/sync/profile_sync_service.h" | 23 #include "chrome/browser/sync/profile_sync_service.h" |
| 24 #include "chrome/browser/sync/profile_sync_service_factory.h" | 24 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 25 #include "chrome/browser/sync/sync_global_error.h" | 25 #include "chrome/browser/sync/sync_global_error.h" |
| 26 #include "chrome/browser/sync/sync_ui_util.h" | 26 #include "chrome/browser/sync/sync_ui_util.h" |
| 27 #include "chrome/browser/task_manager/task_manager.h" | 27 #include "chrome/browser/task_manager/task_manager.h" |
| 28 #include "chrome/browser/ui/browser.h" | 28 #include "chrome/browser/ui/browser.h" |
| 29 #include "chrome/browser/ui/browser_commands.h" | 29 #include "chrome/browser/ui/browser_commands.h" |
| 30 #include "chrome/browser/ui/browser_window.h" | 30 #include "chrome/browser/ui/browser_window.h" |
| 31 #include "chrome/browser/ui/global_error.h" | 31 #include "chrome/browser/ui/global_error/global_error.h" |
| 32 #include "chrome/browser/ui/global_error_service.h" | 32 #include "chrome/browser/ui/global_error/global_error_service.h" |
| 33 #include "chrome/browser/ui/global_error_service_factory.h" | 33 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
| 34 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 34 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 35 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" | 35 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" |
| 36 #include "chrome/browser/upgrade_detector.h" | 36 #include "chrome/browser/upgrade_detector.h" |
| 37 #include "chrome/common/chrome_paths.h" | 37 #include "chrome/common/chrome_paths.h" |
| 38 #include "chrome/common/chrome_switches.h" | 38 #include "chrome/common/chrome_switches.h" |
| 39 #include "chrome/common/pref_names.h" | 39 #include "chrome/common/pref_names.h" |
| 40 #include "chrome/common/profiling.h" | 40 #include "chrome/common/profiling.h" |
| 41 #include "content/public/browser/host_zoom_map.h" | 41 #include "content/public/browser/host_zoom_map.h" |
| 42 #include "content/public/browser/notification_service.h" | 42 #include "content/public/browser/notification_service.h" |
| 43 #include "content/public/browser/notification_source.h" | 43 #include "content/public/browser/notification_source.h" |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 zoom_label_ = l10n_util::GetStringFUTF16( | 619 zoom_label_ = l10n_util::GetStringFUTF16( |
| 620 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); | 620 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); |
| 621 } | 621 } |
| 622 | 622 |
| 623 string16 WrenchMenuModel::GetSyncMenuLabel() const { | 623 string16 WrenchMenuModel::GetSyncMenuLabel() const { |
| 624 Profile* profile = browser_->profile()->GetOriginalProfile(); | 624 Profile* profile = browser_->profile()->GetOriginalProfile(); |
| 625 return sync_ui_util::GetSyncMenuLabel( | 625 return sync_ui_util::GetSyncMenuLabel( |
| 626 ProfileSyncServiceFactory::GetForProfile(profile), | 626 ProfileSyncServiceFactory::GetForProfile(profile), |
| 627 *SigninManagerFactory::GetForProfile(profile)); | 627 *SigninManagerFactory::GetForProfile(profile)); |
| 628 } | 628 } |
| OLD | NEW |