| 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/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
| 6 | 6 |
| 7 #include "apps/shell_window.h" | 7 #include "apps/shell_window.h" |
| 8 #include "apps/shell_window_registry.h" | 8 #include "apps/shell_window_registry.h" |
| 9 #include "ash/host/root_window_host_factory.h" | 9 #include "ash/host/root_window_host_factory.h" |
| 10 #include "ash/magnifier/magnifier_constants.h" | 10 #include "ash/magnifier/magnifier_constants.h" |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 chromeos::default_pinned_apps_field_trial::RecordShelfClick( | 203 chromeos::default_pinned_apps_field_trial::RecordShelfClick( |
| 204 chromeos::default_pinned_apps_field_trial::APP_LAUNCHER); | 204 chromeos::default_pinned_apps_field_trial::APP_LAUNCHER); |
| 205 #endif | 205 #endif |
| 206 break; | 206 break; |
| 207 case ash::UMA_MINIMIZE_PER_KEY: | 207 case ash::UMA_MINIMIZE_PER_KEY: |
| 208 content::RecordAction(content::UserMetricsAction("Minimize_UsingKey")); | 208 content::RecordAction(content::UserMetricsAction("Minimize_UsingKey")); |
| 209 break; | 209 break; |
| 210 case ash::UMA_MOUSE_DOWN: | 210 case ash::UMA_MOUSE_DOWN: |
| 211 content::RecordAction(content::UserMetricsAction("Mouse_Down")); | 211 content::RecordAction(content::UserMetricsAction("Mouse_Down")); |
| 212 break; | 212 break; |
| 213 case ash::UMA_SHELF_ALIGNMENT_SET_BOTTOM: |
| 214 content::RecordAction( |
| 215 content::UserMetricsAction("Shelf_AlignmentSetBottom")); |
| 216 break; |
| 217 case ash::UMA_SHELF_ALIGNMENT_SET_LEFT: |
| 218 content::RecordAction( |
| 219 content::UserMetricsAction("Shelf_AlignmentSetLeft")); |
| 220 break; |
| 221 case ash::UMA_SHELF_ALIGNMENT_SET_RIGHT: |
| 222 content::RecordAction( |
| 223 content::UserMetricsAction("Shelf_AlignmentSetRight")); |
| 224 break; |
| 213 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK: | 225 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK: |
| 214 content::RecordAction( | 226 content::RecordAction( |
| 215 content::UserMetricsAction("Caption_ClickTogglesMaximize")); | 227 content::UserMetricsAction("Caption_ClickTogglesMaximize")); |
| 216 break; | 228 break; |
| 217 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE: | 229 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE: |
| 218 content::RecordAction( | 230 content::RecordAction( |
| 219 content::UserMetricsAction("Caption_GestureTogglesMaximize")); | 231 content::UserMetricsAction("Caption_GestureTogglesMaximize")); |
| 220 break; | 232 break; |
| 221 case ash::UMA_TOUCHPAD_GESTURE_OVERVIEW: | 233 case ash::UMA_TOUCHPAD_GESTURE_OVERVIEW: |
| 222 content::RecordAction( | 234 content::RecordAction( |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 } | 309 } |
| 298 | 310 |
| 299 string16 ChromeShellDelegate::GetProductName() const { | 311 string16 ChromeShellDelegate::GetProductName() const { |
| 300 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 312 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
| 301 } | 313 } |
| 302 | 314 |
| 303 keyboard::KeyboardControllerProxy* | 315 keyboard::KeyboardControllerProxy* |
| 304 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 316 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
| 305 return new AshKeyboardControllerProxy(); | 317 return new AshKeyboardControllerProxy(); |
| 306 } | 318 } |
| OLD | NEW |