Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / chrome_shell_delegate.cc

diff --git a/src/chrome/browser/ui/ash/chrome_shell_delegate.cc b/src/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 2039aad..5fe0574 100644 (file)
--- a/src/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/src/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -4,9 +4,10 @@
 
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
-#include "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
-#include "ash/host/root_window_host_factory.h"
+#include "apps/app_window.h"
+#include "apps/app_window_registry.h"
+#include "ash/content_support/gpu_support_impl.h"
+#include "ash/host/window_tree_host_factory.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
@@ -14,6 +15,7 @@
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
@@ -22,14 +24,13 @@
 #include "chrome/browser/ui/ash/user_action_handler.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h"
+#include "chrome/browser/chromeos/display/display_configuration_observer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
@@ -37,7 +38,7 @@
 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
 
 ChromeShellDelegate::ChromeShellDelegate()
-    : launcher_delegate_(NULL) {
+    : shelf_delegate_(NULL) {
   instance_ = this;
   PlatformInit();
 }
@@ -94,209 +95,65 @@ void ChromeShellDelegate::Exit() {
   chrome::AttemptUserExit();
 }
 
-content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() {
-  return ProfileManager::GetDefaultProfile();
+content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() {
+#if defined(OS_CHROMEOS)
+  DCHECK(chromeos::UserManager::Get()->GetLoggedInUsers().size());
+#endif
+  return ProfileManager::GetActiveUserProfile();
 }
 
 app_list::AppListViewDelegate*
-    ChromeShellDelegate::CreateAppListViewDelegate() {
+ChromeShellDelegate::CreateAppListViewDelegate() {
   DCHECK(ash::Shell::HasInstance());
   // Shell will own the created delegate, and the delegate will own
   // the controller.
-  Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
   return new AppListViewDelegate(
-      scoped_ptr<AppListControllerDelegate>(new AppListControllerDelegateAsh()),
-      profile);
+      Profile::FromBrowserContext(GetActiveBrowserContext()),
+      AppListService::Get(chrome::HOST_DESKTOP_TYPE_ASH)->
+      GetControllerDelegate());
 }
 
-ash::LauncherDelegate* ChromeShellDelegate::CreateLauncherDelegate(
-    ash::LauncherModel* model) {
-  DCHECK(ProfileManager::IsGetDefaultProfileAllowed());
+ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
+    ash::ShelfModel* model) {
   // TODO(oshima): This is currently broken with multiple launchers.
   // Refactor so that there is just one launcher delegate in the
   // shell.
-  if (!launcher_delegate_) {
-    launcher_delegate_ = ChromeLauncherController::CreateInstance(NULL, model);
-    launcher_delegate_->Init();
+  if (!shelf_delegate_) {
+    shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model);
+    shelf_delegate_->Init();
   }
-  return launcher_delegate_;
+  return shelf_delegate_;
 }
 
 aura::client::UserActionClient* ChromeShellDelegate::CreateUserActionClient() {
   return new UserActionHandler;
 }
 
-void ChromeShellDelegate::RecordUserMetricsAction(
-    ash::UserMetricsAction action) {
-  switch (action) {
-    case ash::UMA_ACCEL_KEYBOARD_BRIGHTNESS_DOWN_F6:
-      content::RecordAction(
-          content::UserMetricsAction("Accel_KeyboardBrightnessDown_F6"));
-      break;
-    case ash::UMA_ACCEL_KEYBOARD_BRIGHTNESS_UP_F7:
-      content::RecordAction(
-          content::UserMetricsAction("Accel_KeyboardBrightnessUp_F7"));
-      break;
-    case ash::UMA_ACCEL_LOCK_SCREEN_L:
-      content::RecordAction(
-          content::UserMetricsAction("Accel_LockScreen_L"));
-      break;
-    case ash::UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON:
-      content::RecordAction(
-          content::UserMetricsAction("Accel_LockScreen_LockButton"));
-      break;
-    case ash::UMA_ACCEL_LOCK_SCREEN_POWER_BUTTON:
-      content::RecordAction(
-          content::UserMetricsAction("Accel_LockScreen_PowerButton"));
-      break;
-    case ash::UMA_ACCEL_FULLSCREEN_F4:
-      content::RecordAction(content::UserMetricsAction("Accel_Fullscreen_F4"));
-      break;
-    case ash::UMA_ACCEL_MAXIMIZE_RESTORE_F4:
-      content::RecordAction(
-          content::UserMetricsAction("Accel_Maximize_Restore_F4"));
-      break;
-    case ash::UMA_ACCEL_NEWTAB_T:
-      content::RecordAction(content::UserMetricsAction("Accel_NewTab_T"));
-      break;
-    case ash::UMA_ACCEL_NEXTWINDOW_F5:
-      content::RecordAction(content::UserMetricsAction("Accel_NextWindow_F5"));
-      break;
-    case ash::UMA_ACCEL_NEXTWINDOW_TAB:
-      content::RecordAction(content::UserMetricsAction("Accel_NextWindow_Tab"));
-      break;
-    case ash::UMA_ACCEL_OVERVIEW_F5:
-      content::RecordAction(content::UserMetricsAction("Accel_Overview_F5"));
-      break;
-    case ash::UMA_ACCEL_PREVWINDOW_F5:
-      content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_F5"));
-      break;
-    case ash::UMA_ACCEL_PREVWINDOW_TAB:
-      content::RecordAction(content::UserMetricsAction("Accel_PrevWindow_Tab"));
-      break;
-    case ash::UMA_ACCEL_EXIT_FIRST_Q:
-      content::RecordAction(content::UserMetricsAction("Accel_Exit_First_Q"));
-      break;
-    case ash::UMA_ACCEL_EXIT_SECOND_Q:
-      content::RecordAction(content::UserMetricsAction("Accel_Exit_Second_Q"));
-      break;
-    case ash::UMA_ACCEL_SEARCH_LWIN:
-      content::RecordAction(content::UserMetricsAction("Accel_Search_LWin"));
-      break;
-    case ash::UMA_ACCEL_SHUT_DOWN_POWER_BUTTON:
-      content::RecordAction(
-          content::UserMetricsAction("Accel_ShutDown_PowerButton"));
-      break;
-    case ash::UMA_CLOSE_THROUGH_CONTEXT_MENU:
-      content::RecordAction(content::UserMetricsAction("CloseFromContextMenu"));
-      break;
-    case ash::UMA_GESTURE_OVERVIEW:
-      content::RecordAction(content::UserMetricsAction("Gesture_Overview"));
-      break;
-    case ash::UMA_LAUNCHER_CLICK_ON_APP:
-      content::RecordAction(content::UserMetricsAction("Launcher_ClickOnApp"));
-      break;
-    case ash::UMA_LAUNCHER_CLICK_ON_APPLIST_BUTTON:
-      content::RecordAction(
-          content::UserMetricsAction("Launcher_ClickOnApplistButton"));
-#if defined(OS_CHROMEOS)
-      chromeos::default_pinned_apps_field_trial::RecordShelfClick(
-          chromeos::default_pinned_apps_field_trial::APP_LAUNCHER);
-#endif
-      break;
-    case ash::UMA_MINIMIZE_PER_KEY:
-      content::RecordAction(content::UserMetricsAction("Minimize_UsingKey"));
-      break;
-    case ash::UMA_MOUSE_DOWN:
-      content::RecordAction(content::UserMetricsAction("Mouse_Down"));
-      break;
-    case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK:
-      content::RecordAction(
-          content::UserMetricsAction("Caption_ClickTogglesMaximize"));
-      break;
-    case ash::UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE:
-      content::RecordAction(
-          content::UserMetricsAction("Caption_GestureTogglesMaximize"));
-      break;
-    case ash::UMA_TOUCHPAD_GESTURE_OVERVIEW:
-      content::RecordAction(
-          content::UserMetricsAction("Touchpad_Gesture_Overview"));
-      break;
-    case ash::UMA_TOUCHSCREEN_TAP_DOWN:
-      content::RecordAction(content::UserMetricsAction("Touchscreen_Down"));
-      break;
-    case ash::UMA_TRAY_HELP:
-      content::RecordAction(content::UserMetricsAction("Tray_Help"));
-      break;
-    case ash::UMA_TRAY_LOCK_SCREEN:
-      content::RecordAction(content::UserMetricsAction("Tray_LockScreen"));
-      break;
-    case ash::UMA_TRAY_SHUT_DOWN:
-      content::RecordAction(content::UserMetricsAction("Tray_ShutDown"));
-      break;
-    case ash::UMA_WINDOW_APP_CLOSE_BUTTON_CLICK:
-      content::RecordAction(content::UserMetricsAction("AppCloseButton_Clk"));
-      break;
-    case ash::UMA_WINDOW_CLOSE_BUTTON_CLICK:
-      content::RecordAction(content::UserMetricsAction("CloseButton_Clk"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_EXIT_FULLSCREEN:
-      content::RecordAction(content::UserMetricsAction("MaxButton_Clk_ExitFS"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_RESTORE:
-      content::RecordAction(
-          content::UserMetricsAction("MaxButton_Clk_Restore"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE:
-      content::RecordAction(
-          content::UserMetricsAction("MaxButton_Clk_Maximize"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MINIMIZE:
-      content::RecordAction(content::UserMetricsAction("MinButton_Clk"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE:
-      content::RecordAction(content::UserMetricsAction("MaxButton_Maximize"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_LEFT:
-      content::RecordAction(content::UserMetricsAction("MaxButton_MaxLeft"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_RIGHT:
-      content::RecordAction(content::UserMetricsAction("MaxButton_MaxRight"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_MINIMIZE:
-      content::RecordAction(content::UserMetricsAction("MaxButton_Minimize"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_RESTORE:
-      content::RecordAction(content::UserMetricsAction("MaxButton_Restore"));
-      break;
-    case ash::UMA_WINDOW_MAXIMIZE_BUTTON_SHOW_BUBBLE:
-      content::RecordAction(content::UserMetricsAction("MaxButton_ShowBubble"));
-      break;
-    case ash::UMA_WINDOW_OVERVIEW:
-      content::RecordAction(
-          content::UserMetricsAction("WindowSelector_Overview"));
-      break;
-    case ash::UMA_WINDOW_SELECTION:
-      content::RecordAction(
-          content::UserMetricsAction("WindowSelector_Selection"));
-      break;
-  }
-}
-
-ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::Window* root) {
-  DCHECK(launcher_delegate_);
+ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
+    aura::Window* root,
+    ash::ShelfItemDelegate* item_delegate,
+    ash::ShelfItem* item) {
+  DCHECK(shelf_delegate_);
   // Don't show context menu for exclusive app runtime mode.
   if (chrome::IsRunningInAppMode())
     return NULL;
 
-  return new LauncherContextMenu(launcher_delegate_, root);
+  if (item_delegate && item)
+    return new LauncherContextMenu(shelf_delegate_, item_delegate, item, root);
+
+  return new LauncherContextMenu(shelf_delegate_, root);
+}
+
+ash::WindowTreeHostFactory* ChromeShellDelegate::CreateWindowTreeHostFactory() {
+  return ash::WindowTreeHostFactory::Create();
 }
 
-ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() {
-  return ash::RootWindowHostFactory::Create();
+ash::GPUSupport* ChromeShellDelegate::CreateGPUSupport() {
+  // Chrome uses real GPU support.
+  return new ash::GPUSupportImpl;
 }
 
-string16 ChromeShellDelegate::GetProductName() const {
+base::string16 ChromeShellDelegate::GetProductName() const {
   return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
 }