| 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 "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/host/root_window_host_factory.h" | 9 #include "ash/host/root_window_host_factory.h" |
| 10 #include "ash/launcher/launcher_types.h" | 10 #include "ash/launcher/launcher_types.h" |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 break; | 307 break; |
| 308 case ash::UMA_ACCEL_NEWTAB_T: | 308 case ash::UMA_ACCEL_NEWTAB_T: |
| 309 content::RecordAction(content::UserMetricsAction("Accel_NewTab_T")); | 309 content::RecordAction(content::UserMetricsAction("Accel_NewTab_T")); |
| 310 break; | 310 break; |
| 311 case ash::UMA_ACCEL_NEXTWINDOW_F5: | 311 case ash::UMA_ACCEL_NEXTWINDOW_F5: |
| 312 content::RecordAction(content::UserMetricsAction("Accel_NextWindow_F5")); | 312 content::RecordAction(content::UserMetricsAction("Accel_NextWindow_F5")); |
| 313 break; | 313 break; |
| 314 case ash::UMA_ACCEL_NEXTWINDOW_TAB: | 314 case ash::UMA_ACCEL_NEXTWINDOW_TAB: |
| 315 content::RecordAction(content::UserMetricsAction("Accel_NextWindow_Tab")); | 315 content::RecordAction(content::UserMetricsAction("Accel_NextWindow_Tab")); |
| 316 break; | 316 break; |
| 317 case ash::UMA_ACCEL_OVERVIEW_F5: |
| 318 content::RecordAction(content::UserMetricsAction("Accel_Overview_F5")); |
| 319 break; |
| 317 case ash::UMA_ACCEL_PREVWINDOW_F5: | 320 case ash::UMA_ACCEL_PREVWINDOW_F5: |
| 318 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_F5")); | 321 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_F5")); |
| 319 break; | 322 break; |
| 320 case ash::UMA_ACCEL_PREVWINDOW_TAB: | 323 case ash::UMA_ACCEL_PREVWINDOW_TAB: |
| 321 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_Tab")); | 324 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_Tab")); |
| 322 break; | 325 break; |
| 323 case ash::UMA_ACCEL_EXIT_FIRST_Q: | 326 case ash::UMA_ACCEL_EXIT_FIRST_Q: |
| 324 content::RecordAction(content::UserMetricsAction("Accel_Exit_First_Q")); | 327 content::RecordAction(content::UserMetricsAction("Accel_Exit_First_Q")); |
| 325 break; | 328 break; |
| 326 case ash::UMA_ACCEL_EXIT_SECOND_Q: | 329 case ash::UMA_ACCEL_EXIT_SECOND_Q: |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 return browser; | 448 return browser; |
| 446 return chrome::FindOrCreateTabbedBrowser( | 449 return chrome::FindOrCreateTabbedBrowser( |
| 447 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 450 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
| 448 chrome::HOST_DESKTOP_TYPE_ASH); | 451 chrome::HOST_DESKTOP_TYPE_ASH); |
| 449 } | 452 } |
| 450 | 453 |
| 451 keyboard::KeyboardControllerProxy* | 454 keyboard::KeyboardControllerProxy* |
| 452 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 455 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
| 453 return new AshKeyboardControllerProxy(); | 456 return new AshKeyboardControllerProxy(); |
| 454 } | 457 } |
| OLD | NEW |