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 "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/host/root_window_host_factory.h" | 8 #include "ash/host/root_window_host_factory.h" |
9 #include "ash/launcher/launcher_types.h" | 9 #include "ash/launcher/launcher_types.h" |
10 #include "ash/magnifier/magnifier_constants.h" | 10 #include "ash/magnifier/magnifier_constants.h" |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
305 break; | 305 break; |
306 case ash::UMA_ACCEL_NEXTWINDOW_TAB: | 306 case ash::UMA_ACCEL_NEXTWINDOW_TAB: |
307 content::RecordAction(content::UserMetricsAction("Accel_NextWindow_Tab")); | 307 content::RecordAction(content::UserMetricsAction("Accel_NextWindow_Tab")); |
308 break; | 308 break; |
309 case ash::UMA_ACCEL_PREVWINDOW_F5: | 309 case ash::UMA_ACCEL_PREVWINDOW_F5: |
310 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_F5")); | 310 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_F5")); |
311 break; | 311 break; |
312 case ash::UMA_ACCEL_PREVWINDOW_TAB: | 312 case ash::UMA_ACCEL_PREVWINDOW_TAB: |
313 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_Tab")); | 313 content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_Tab")); |
314 break; | 314 break; |
| 315 case ash::UMA_ACCEL_EXIT_FIRST_Q: |
| 316 content::RecordAction(content::UserMetricsAction("Accel_Exit_First_Q")); |
| 317 break; |
| 318 case ash::UMA_ACCEL_EXIT_SECOND_Q: |
| 319 content::RecordAction(content::UserMetricsAction("Accel_Exit_Second_Q")); |
| 320 break; |
315 case ash::UMA_ACCEL_SEARCH_LWIN: | 321 case ash::UMA_ACCEL_SEARCH_LWIN: |
316 content::RecordAction(content::UserMetricsAction("Accel_Search_LWin")); | 322 content::RecordAction(content::UserMetricsAction("Accel_Search_LWin")); |
317 break; | 323 break; |
318 case ash::UMA_ACCEL_SHUT_DOWN_POWER_BUTTON: | 324 case ash::UMA_ACCEL_SHUT_DOWN_POWER_BUTTON: |
319 content::RecordAction( | 325 content::RecordAction( |
320 content::UserMetricsAction("Accel_ShutDown_PowerButton")); | 326 content::UserMetricsAction("Accel_ShutDown_PowerButton")); |
321 break; | 327 break; |
322 case ash::UMA_CLOSE_THROUGH_CONTEXT_MENU: | 328 case ash::UMA_CLOSE_THROUGH_CONTEXT_MENU: |
323 content::RecordAction(content::UserMetricsAction("CloseFromContextMenu")); | 329 content::RecordAction(content::UserMetricsAction("CloseFromContextMenu")); |
324 break; | 330 break; |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
431 return browser; | 437 return browser; |
432 return chrome::FindOrCreateTabbedBrowser( | 438 return chrome::FindOrCreateTabbedBrowser( |
433 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 439 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
434 chrome::HOST_DESKTOP_TYPE_ASH); | 440 chrome::HOST_DESKTOP_TYPE_ASH); |
435 } | 441 } |
436 | 442 |
437 keyboard::KeyboardControllerProxy* | 443 keyboard::KeyboardControllerProxy* |
438 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 444 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
439 return new AshKeyboardControllerProxy(); | 445 return new AshKeyboardControllerProxy(); |
440 } | 446 } |
OLD | NEW |