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 "apps/ui/native_app_window.h" | 9 #include "apps/ui/native_app_window.h" |
10 #include "ash/host/root_window_host_factory.h" | 10 #include "ash/host/root_window_host_factory.h" |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 chromeos::default_pinned_apps_field_trial::RecordShelfClick( | 355 chromeos::default_pinned_apps_field_trial::RecordShelfClick( |
356 chromeos::default_pinned_apps_field_trial::APP_LAUNCHER); | 356 chromeos::default_pinned_apps_field_trial::APP_LAUNCHER); |
357 #endif | 357 #endif |
358 break; | 358 break; |
359 case ash::UMA_MINIMIZE_PER_KEY: | 359 case ash::UMA_MINIMIZE_PER_KEY: |
360 content::RecordAction(content::UserMetricsAction("Minimize_UsingKey")); | 360 content::RecordAction(content::UserMetricsAction("Minimize_UsingKey")); |
361 break; | 361 break; |
362 case ash::UMA_MOUSE_DOWN: | 362 case ash::UMA_MOUSE_DOWN: |
363 content::RecordAction(content::UserMetricsAction("Mouse_Down")); | 363 content::RecordAction(content::UserMetricsAction("Mouse_Down")); |
364 break; | 364 break; |
| 365 case ash::UMA_SHELF_ALIGNMENT_SET_BOTTOM: |
| 366 content::RecordAction( |
| 367 content::UserMetricsAction("Shelf_AlignmentSetBottom")); |
| 368 break; |
| 369 case ash::UMA_SHELF_ALIGNMENT_SET_LEFT: |
| 370 content::RecordAction( |
| 371 content::UserMetricsAction("Shelf_AlignmentSetLeft")); |
| 372 break; |
| 373 case ash::UMA_SHELF_ALIGNMENT_SET_RIGHT: |
| 374 content::RecordAction( |
| 375 content::UserMetricsAction("Shelf_AlignmentSetRight")); |
| 376 break; |
365 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK: | 377 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK: |
366 content::RecordAction( | 378 content::RecordAction( |
367 content::UserMetricsAction("Caption_ClickTogglesMaximize")); | 379 content::UserMetricsAction("Caption_ClickTogglesMaximize")); |
368 break; | 380 break; |
369 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE: | 381 case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE: |
370 content::RecordAction( | 382 content::RecordAction( |
371 content::UserMetricsAction("Caption_GestureTogglesMaximize")); | 383 content::UserMetricsAction("Caption_GestureTogglesMaximize")); |
372 break; | 384 break; |
373 case ash::UMA_TOUCHSCREEN_TAP_DOWN: | 385 case ash::UMA_TOUCHSCREEN_TAP_DOWN: |
374 content::RecordAction(content::UserMetricsAction("Touchscreen_Down")); | 386 content::RecordAction(content::UserMetricsAction("Touchscreen_Down")); |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 } | 470 } |
459 | 471 |
460 Browser* ChromeShellDelegate::GetTargetBrowserIfAvailable() { | 472 Browser* ChromeShellDelegate::GetTargetBrowserIfAvailable() { |
461 return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); | 473 return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); |
462 } | 474 } |
463 | 475 |
464 keyboard::KeyboardControllerProxy* | 476 keyboard::KeyboardControllerProxy* |
465 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 477 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
466 return new AshKeyboardControllerProxy(); | 478 return new AshKeyboardControllerProxy(); |
467 } | 479 } |
OLD | NEW |