| 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/native_app_window.h" | 7 #include "apps/native_app_window.h" |
| 8 #include "apps/shell_window.h" | 8 #include "apps/shell_window.h" |
| 9 #include "apps/shell_window_registry.h" | 9 #include "apps/shell_window_registry.h" |
| 10 #include "ash/host/root_window_host_factory.h" | 10 #include "ash/host/root_window_host_factory.h" |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 break; | 410 break; |
| 411 case ash::UMA_WINDOW_MAXIMIZE_BUTTON_MINIMIZE: | 411 case ash::UMA_WINDOW_MAXIMIZE_BUTTON_MINIMIZE: |
| 412 content::RecordAction(content::UserMetricsAction("MaxButton_Minimize")); | 412 content::RecordAction(content::UserMetricsAction("MaxButton_Minimize")); |
| 413 break; | 413 break; |
| 414 case ash::UMA_WINDOW_MAXIMIZE_BUTTON_RESTORE: | 414 case ash::UMA_WINDOW_MAXIMIZE_BUTTON_RESTORE: |
| 415 content::RecordAction(content::UserMetricsAction("MaxButton_Restore")); | 415 content::RecordAction(content::UserMetricsAction("MaxButton_Restore")); |
| 416 break; | 416 break; |
| 417 case ash::UMA_WINDOW_MAXIMIZE_BUTTON_SHOW_BUBBLE: | 417 case ash::UMA_WINDOW_MAXIMIZE_BUTTON_SHOW_BUBBLE: |
| 418 content::RecordAction(content::UserMetricsAction("MaxButton_ShowBubble")); | 418 content::RecordAction(content::UserMetricsAction("MaxButton_ShowBubble")); |
| 419 break; | 419 break; |
| 420 case ash::UMA_WINDOW_OVERVIEW: |
| 421 content::RecordAction( |
| 422 content::UserMetricsAction("WindowSelector_Overview")); |
| 423 break; |
| 424 case ash::UMA_WINDOW_SELECTION: |
| 425 content::RecordAction( |
| 426 content::UserMetricsAction("WindowSelector_Selection")); |
| 427 break; |
| 420 } | 428 } |
| 421 } | 429 } |
| 422 | 430 |
| 423 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::RootWindow* root) { | 431 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::RootWindow* root) { |
| 424 DCHECK(launcher_delegate_); | 432 DCHECK(launcher_delegate_); |
| 425 // Don't show context menu for exclusive app runtime mode. | 433 // Don't show context menu for exclusive app runtime mode. |
| 426 if (chrome::IsRunningInAppMode()) | 434 if (chrome::IsRunningInAppMode()) |
| 427 return NULL; | 435 return NULL; |
| 428 | 436 |
| 429 return new LauncherContextMenu(launcher_delegate_, root); | 437 return new LauncherContextMenu(launcher_delegate_, root); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 443 return browser; | 451 return browser; |
| 444 return chrome::FindOrCreateTabbedBrowser( | 452 return chrome::FindOrCreateTabbedBrowser( |
| 445 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 453 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
| 446 chrome::HOST_DESKTOP_TYPE_ASH); | 454 chrome::HOST_DESKTOP_TYPE_ASH); |
| 447 } | 455 } |
| 448 | 456 |
| 449 keyboard::KeyboardControllerProxy* | 457 keyboard::KeyboardControllerProxy* |
| 450 ChromeShellDelegate::CreateKeyboardControllerProxy() { | 458 ChromeShellDelegate::CreateKeyboardControllerProxy() { |
| 451 return new AshKeyboardControllerProxy(); | 459 return new AshKeyboardControllerProxy(); |
| 452 } | 460 } |
| OLD | NEW |