| 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| 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/enumerate_modules_model_win.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" |
| 86 #endif | 86 #endif |
| 87 | 87 |
| 88 using base::UserMetricsAction; | 88 using base::UserMetricsAction; |
| 89 using content::WebContents; | 89 using content::WebContents; |
| 90 | 90 |
| (...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 939 browser_->tab_strip_model()->GetActiveWebContents()) | 939 browser_->tab_strip_model()->GetActiveWebContents()) |
| 940 ->GetZoomPercent(); | 940 ->GetZoomPercent(); |
| 941 } | 941 } |
| 942 zoom_label_ = base::FormatPercent(zoom_percent); | 942 zoom_label_ = base::FormatPercent(zoom_percent); |
| 943 } | 943 } |
| 944 | 944 |
| 945 void AppMenuModel::OnZoomLevelChanged( | 945 void AppMenuModel::OnZoomLevelChanged( |
| 946 const content::HostZoomMap::ZoomLevelChange& change) { | 946 const content::HostZoomMap::ZoomLevelChange& change) { |
| 947 UpdateZoomControls(); | 947 UpdateZoomControls(); |
| 948 } | 948 } |
| OLD | NEW |