| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 #endif | 75 #endif |
| 76 | 76 |
| 77 #if defined(OS_WIN) | 77 #if defined(OS_WIN) |
| 78 #include "base/win/shortcut.h" | 78 #include "base/win/shortcut.h" |
| 79 #include "base/win/windows_version.h" | 79 #include "base/win/windows_version.h" |
| 80 #include "chrome/browser/win/enumerate_modules_model.h" | 80 #include "chrome/browser/win/enumerate_modules_model.h" |
| 81 #include "content/public/browser/gpu_data_manager.h" | 81 #include "content/public/browser/gpu_data_manager.h" |
| 82 #endif | 82 #endif |
| 83 | 83 |
| 84 #if defined(USE_ASH) | 84 #if defined(USE_ASH) |
| 85 #include "ash/shell.h" | 85 #include "ash/shell.h" // nogncheck |
| 86 #endif | 86 #endif |
| 87 | 87 |
| 88 using base::UserMetricsAction; | 88 using base::UserMetricsAction; |
| 89 using content::WebContents; | 89 using content::WebContents; |
| 90 | 90 |
| 91 namespace { | 91 namespace { |
| 92 | 92 |
| 93 #if defined(OS_MACOSX) | 93 #if defined(OS_MACOSX) |
| 94 // An empty command used because of a bug in AppKit menus. | 94 // An empty command used because of a bug in AppKit menus. |
| 95 // See comment in CreateActionToolbarOverflowMenu(). | 95 // See comment in CreateActionToolbarOverflowMenu(). |
| (...skipping 838 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 |