| 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 chromeos::default_pinned_apps_field_trial::RecordShelfClick( | 245 chromeos::default_pinned_apps_field_trial::RecordShelfClick( |
| 246 chromeos::default_pinned_apps_field_trial::APP_LAUNCHER); | 246 chromeos::default_pinned_apps_field_trial::APP_LAUNCHER); |
| 247 #endif | 247 #endif |
| 248 break; | 248 break; |
| 249 case ash::UMA_MINIMIZE_PER_KEY: | 249 case ash::UMA_MINIMIZE_PER_KEY: |
| 250 content::RecordAction(content::UserMetricsAction("Minimize_UsingKey")); | 250 content::RecordAction(content::UserMetricsAction("Minimize_UsingKey")); |
| 251 break; | 251 break; |
| 252 case ash::UMA_MOUSE_DOWN: | 252 case ash::UMA_MOUSE_DOWN: |
| 253 content::RecordAction(content::UserMetricsAction("Mouse_Down")); | 253 content::RecordAction(content::UserMetricsAction("Mouse_Down")); |
| 254 break; | 254 break; |
| 255 case ash::UMA_SHELF_ALIGNMENT_SET_BOTTOM: |
| 256 content::RecordAction( |
| 257 content::UserMetricsAction("Shelf_AlignmentSetBottom")); |
| 258 break; |
| 259 case ash::UMA_SHELF_ALIGNMENT_SET_LEFT: |
| 260 content::RecordAction( |
| 261 content::UserMetricsAction("Shelf_AlignmentSetLeft")); |
| 262 break; |
| 263 case ash::UMA_SHELF_ALIGNMENT_SET_RIGHT: |
| 264 content::RecordAction( |
| 265 content::UserMetricsAction("Shelf_AlignmentSetRight")); |
| 266 break; |
| 255 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK: | 267 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK: |
| 256 content::RecordAction( | 268 content::RecordAction( |
| 257 content::UserMetricsAction("Caption_ClickTogglesMaximize")); | 269 content::UserMetricsAction("Caption_ClickTogglesMaximize")); |
| 258 break; | 270 break; |
| 259 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE: | 271 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE: |
| 260 content::RecordAction( | 272 content::RecordAction( |
| 261 content::UserMetricsAction("Caption_GestureTogglesMaximize")); | 273 content::UserMetricsAction("Caption_GestureTogglesMaximize")); |
| 262 break; | 274 break; |
| 263 case ash::UMA_TOUCHSCREEN_TAP_DOWN: | 275 case ash::UMA_TOUCHSCREEN_TAP_DOWN: |
| 264 content::RecordAction(content::UserMetricsAction("Touchscreen_Down")); | 276 content::RecordAction(content::UserMetricsAction("Touchscreen_Down")); |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 } | 347 } |
| 336 | 348 |
| 337 string16 ChromeShellDelegate::GetProductName() const { | 349 string16 ChromeShellDelegate::GetProductName() const { |
| 338 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 350 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
| 339 } | 351 } |
| 340 | 352 |
| 341 keyboard::KeyboardControllerProxy* | 353 keyboard::KeyboardControllerProxy* |
| 342 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 354 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
| 343 return new AshKeyboardControllerProxy(); | 355 return new AshKeyboardControllerProxy(); |
| 344 } | 356 } |
| OLD | NEW |