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 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/ui/browser_commands.h" | 26 #include "chrome/browser/ui/browser_commands.h" |
27 #include "chrome/browser/ui/browser_finder.h" | 27 #include "chrome/browser/ui/browser_finder.h" |
28 #include "chrome/browser/ui/browser_window.h" | 28 #include "chrome/browser/ui/browser_window.h" |
29 #include "chrome/browser/ui/global_error/global_error.h" | 29 #include "chrome/browser/ui/global_error/global_error.h" |
30 #include "chrome/browser/ui/global_error/global_error_service.h" | 30 #include "chrome/browser/ui/global_error/global_error_service.h" |
31 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 31 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
32 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 32 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
33 #include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h" | 33 #include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h" |
34 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" | 34 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" |
35 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 35 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" |
| 36 #include "chrome/browser/ui/zoom/zoom_controller.h" |
36 #include "chrome/browser/upgrade_detector.h" | 37 #include "chrome/browser/upgrade_detector.h" |
37 #include "chrome/common/chrome_paths.h" | 38 #include "chrome/common/chrome_paths.h" |
38 #include "chrome/common/chrome_switches.h" | 39 #include "chrome/common/chrome_switches.h" |
39 #include "chrome/common/pref_names.h" | 40 #include "chrome/common/pref_names.h" |
40 #include "chrome/common/profiling.h" | 41 #include "chrome/common/profiling.h" |
41 #include "components/signin/core/browser/signin_manager.h" | 42 #include "components/signin/core/browser/signin_manager.h" |
42 #include "components/signin/core/common/profile_management_switches.h" | 43 #include "components/signin/core/common/profile_management_switches.h" |
43 #include "content/public/browser/host_zoom_map.h" | 44 #include "content/public/browser/host_zoom_map.h" |
44 #include "content/public/browser/navigation_entry.h" | 45 #include "content/public/browser/navigation_entry.h" |
45 #include "content/public/browser/notification_service.h" | 46 #include "content/public/browser/notification_service.h" |
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
776 // you change the order you'll need to update wrench_menu as well. | 777 // you change the order you'll need to update wrench_menu as well. |
777 AddItemWithStringId(IDC_ZOOM_MINUS, IDS_ZOOM_MINUS); | 778 AddItemWithStringId(IDC_ZOOM_MINUS, IDS_ZOOM_MINUS); |
778 AddItemWithStringId(IDC_ZOOM_PLUS, IDS_ZOOM_PLUS); | 779 AddItemWithStringId(IDC_ZOOM_PLUS, IDS_ZOOM_PLUS); |
779 AddItemWithStringId(IDC_FULLSCREEN, IDS_FULLSCREEN); | 780 AddItemWithStringId(IDC_FULLSCREEN, IDS_FULLSCREEN); |
780 #endif | 781 #endif |
781 | 782 |
782 AddSeparator(new_menu ? ui::UPPER_SEPARATOR : ui::NORMAL_SEPARATOR); | 783 AddSeparator(new_menu ? ui::UPPER_SEPARATOR : ui::NORMAL_SEPARATOR); |
783 } | 784 } |
784 | 785 |
785 void WrenchMenuModel::UpdateZoomControls() { | 786 void WrenchMenuModel::UpdateZoomControls() { |
786 bool enable_increment = false; | |
787 bool enable_decrement = false; | |
788 int zoom_percent = 100; | 787 int zoom_percent = 100; |
789 if (browser_->tab_strip_model()->GetActiveWebContents()) { | 788 if (browser_->tab_strip_model()->GetActiveWebContents()) { |
790 zoom_percent = | 789 zoom_percent = ZoomController::FromWebContents( |
791 browser_->tab_strip_model()->GetActiveWebContents()->GetZoomPercent( | 790 browser_->tab_strip_model()->GetActiveWebContents()) |
792 &enable_increment, &enable_decrement); | 791 ->GetZoomPercent(); |
793 } | 792 } |
794 zoom_label_ = l10n_util::GetStringFUTF16( | 793 zoom_label_ = l10n_util::GetStringFUTF16( |
795 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); | 794 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); |
796 } | 795 } |
797 | 796 |
798 void WrenchMenuModel::OnZoomLevelChanged( | 797 void WrenchMenuModel::OnZoomLevelChanged( |
799 const content::HostZoomMap::ZoomLevelChange& change) { | 798 const content::HostZoomMap::ZoomLevelChange& change) { |
800 UpdateZoomControls(); | 799 UpdateZoomControls(); |
801 } | 800 } |
OLD | NEW |