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/app_menu_model.h" | 5 #include "chrome/browser/ui/toolbar/app_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 28 matching lines...) Expand all Loading... |
39 #include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h" | 39 #include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h" |
40 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" | 40 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" |
41 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 41 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" |
42 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 42 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
43 #include "chrome/browser/upgrade_detector.h" | 43 #include "chrome/browser/upgrade_detector.h" |
44 #include "chrome/common/chrome_paths.h" | 44 #include "chrome/common/chrome_paths.h" |
45 #include "chrome/common/chrome_switches.h" | 45 #include "chrome/common/chrome_switches.h" |
46 #include "chrome/common/profiling.h" | 46 #include "chrome/common/profiling.h" |
47 #include "chrome/grit/chromium_strings.h" | 47 #include "chrome/grit/chromium_strings.h" |
48 #include "chrome/grit/generated_resources.h" | 48 #include "chrome/grit/generated_resources.h" |
| 49 #include "chrome/grit/theme_resources.h" |
49 #include "components/bookmarks/common/bookmark_pref_names.h" | 50 #include "components/bookmarks/common/bookmark_pref_names.h" |
50 #include "components/dom_distiller/core/dom_distiller_switches.h" | 51 #include "components/dom_distiller/core/dom_distiller_switches.h" |
51 #include "components/prefs/pref_service.h" | 52 #include "components/prefs/pref_service.h" |
52 #include "components/signin/core/browser/signin_manager.h" | 53 #include "components/signin/core/browser/signin_manager.h" |
53 #include "components/signin/core/common/profile_management_switches.h" | 54 #include "components/signin/core/common/profile_management_switches.h" |
| 55 #include "components/strings/grit/components_strings.h" |
54 #include "components/zoom/zoom_controller.h" | 56 #include "components/zoom/zoom_controller.h" |
55 #include "components/zoom/zoom_event_manager.h" | 57 #include "components/zoom/zoom_event_manager.h" |
56 #include "content/public/browser/host_zoom_map.h" | 58 #include "content/public/browser/host_zoom_map.h" |
57 #include "content/public/browser/navigation_entry.h" | 59 #include "content/public/browser/navigation_entry.h" |
58 #include "content/public/browser/notification_service.h" | 60 #include "content/public/browser/notification_service.h" |
59 #include "content/public/browser/notification_source.h" | 61 #include "content/public/browser/notification_source.h" |
60 #include "content/public/browser/notification_types.h" | 62 #include "content/public/browser/notification_types.h" |
61 #include "content/public/browser/user_metrics.h" | 63 #include "content/public/browser/user_metrics.h" |
62 #include "content/public/browser/web_contents.h" | 64 #include "content/public/browser/web_contents.h" |
63 #include "extensions/common/feature_switch.h" | 65 #include "extensions/common/feature_switch.h" |
64 #include "grit/components_strings.h" | |
65 #include "grit/theme_resources.h" | |
66 #include "ui/base/l10n/l10n_util.h" | 66 #include "ui/base/l10n/l10n_util.h" |
67 #include "ui/base/layout.h" | 67 #include "ui/base/layout.h" |
68 #include "ui/base/models/button_menu_item_model.h" | 68 #include "ui/base/models/button_menu_item_model.h" |
69 #include "ui/base/resource/resource_bundle.h" | 69 #include "ui/base/resource/resource_bundle.h" |
70 #include "ui/gfx/image/image.h" | 70 #include "ui/gfx/image/image.h" |
71 #include "ui/gfx/image/image_skia.h" | 71 #include "ui/gfx/image/image_skia.h" |
72 | 72 |
73 #if defined(OS_CHROMEOS) | 73 #if defined(OS_CHROMEOS) |
74 #include "chromeos/chromeos_switches.h" | 74 #include "chromeos/chromeos_switches.h" |
75 #endif | 75 #endif |
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
934 browser_->tab_strip_model()->GetActiveWebContents()) | 934 browser_->tab_strip_model()->GetActiveWebContents()) |
935 ->GetZoomPercent(); | 935 ->GetZoomPercent(); |
936 } | 936 } |
937 zoom_label_ = base::FormatPercent(zoom_percent); | 937 zoom_label_ = base::FormatPercent(zoom_percent); |
938 } | 938 } |
939 | 939 |
940 void AppMenuModel::OnZoomLevelChanged( | 940 void AppMenuModel::OnZoomLevelChanged( |
941 const content::HostZoomMap::ZoomLevelChange& change) { | 941 const content::HostZoomMap::ZoomLevelChange& change) { |
942 UpdateZoomControls(); | 942 UpdateZoomControls(); |
943 } | 943 } |
OLD | NEW |