| 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 content::RecordAction(content::UserMetricsAction("Launcher_ClickOnApp")); | 173 content::RecordAction(content::UserMetricsAction("Launcher_ClickOnApp")); |
| 174 break; | 174 break; |
| 175 case ash::UMA_LAUNCHER_CLICK_ON_APPLIST_BUTTON: | 175 case ash::UMA_LAUNCHER_CLICK_ON_APPLIST_BUTTON: |
| 176 content::RecordAction( | 176 content::RecordAction( |
| 177 content::UserMetricsAction("Launcher_ClickOnApplistButton")); | 177 content::UserMetricsAction("Launcher_ClickOnApplistButton")); |
| 178 #if defined(OS_CHROMEOS) | 178 #if defined(OS_CHROMEOS) |
| 179 chromeos::default_pinned_apps_field_trial::RecordShelfClick( | 179 chromeos::default_pinned_apps_field_trial::RecordShelfClick( |
| 180 chromeos::default_pinned_apps_field_trial::APP_LAUNCHER); | 180 chromeos::default_pinned_apps_field_trial::APP_LAUNCHER); |
| 181 #endif | 181 #endif |
| 182 break; | 182 break; |
| 183 case ash::UMA_MINIMIZE_PER_KEY: | |
| 184 content::RecordAction(content::UserMetricsAction("Minimize_UsingKey")); | |
| 185 break; | |
| 186 case ash::UMA_MOUSE_DOWN: | 183 case ash::UMA_MOUSE_DOWN: |
| 187 content::RecordAction(content::UserMetricsAction("Mouse_Down")); | 184 content::RecordAction(content::UserMetricsAction("Mouse_Down")); |
| 188 break; | 185 break; |
| 189 case ash::UMA_SHELF_ALIGNMENT_SET_BOTTOM: | 186 case ash::UMA_SHELF_ALIGNMENT_SET_BOTTOM: |
| 190 content::RecordAction( | 187 content::RecordAction( |
| 191 content::UserMetricsAction("Shelf_AlignmentSetBottom")); | 188 content::UserMetricsAction("Shelf_AlignmentSetBottom")); |
| 192 break; | 189 break; |
| 193 case ash::UMA_SHELF_ALIGNMENT_SET_LEFT: | 190 case ash::UMA_SHELF_ALIGNMENT_SET_LEFT: |
| 194 content::RecordAction( | 191 content::RecordAction( |
| 195 content::UserMetricsAction("Shelf_AlignmentSetLeft")); | 192 content::UserMetricsAction("Shelf_AlignmentSetLeft")); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 } | 282 } |
| 286 | 283 |
| 287 string16 ChromeShellDelegate::GetProductName() const { | 284 string16 ChromeShellDelegate::GetProductName() const { |
| 288 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 285 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
| 289 } | 286 } |
| 290 | 287 |
| 291 keyboard::KeyboardControllerProxy* | 288 keyboard::KeyboardControllerProxy* |
| 292 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 289 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
| 293 return new AshKeyboardControllerProxy(); | 290 return new AshKeyboardControllerProxy(); |
| 294 } | 291 } |
| OLD | NEW |