chrome: Switch to use chrome_shell_delegate from ash/.

BUG=125846
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10824352

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152200 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/ash/ash_init.cc

@@ -15,9 +15,9 @@
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/ash/caps_lock_handler.h"
+#include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/ash/event_rewriter.h"
 #include "chrome/browser/ui/ash/screenshot_taker.h"
-#include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/display_manager.h"

chrome/browser/ui/views/frame/browser_view.cc

@@ -116,8 +116,8 @@
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "chrome/browser/ui/ash/ash_util.h"
+#include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
-#include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/ash/window_positioner.h"
 #elif defined(OS_WIN) && !defined(USE_AURA)
 #include "base/win/metro.h"

chrome/chrome_browser.gypi

@@ -2480,6 +2480,8 @@
         'browser/ui/ash/brightness_controller_chromeos.h',
         'browser/ui/ash/chrome_launcher_prefs.cc',
         'browser/ui/ash/chrome_launcher_prefs.h',
+        'browser/ui/ash/chrome_shell_delegate.cc',
+        'browser/ui/ash/chrome_shell_delegate.h',
         'browser/ui/ash/event_rewriter.cc',
         'browser/ui/ash/event_rewriter.h',
         'browser/ui/ash/extension_utils.cc',
@@ -3591,8 +3593,6 @@
         'browser/ui/views/ash/browser_non_client_frame_view_ash.cc',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
-        'browser/ui/views/ash/chrome_shell_delegate.cc',
-        'browser/ui/views/ash/chrome_shell_delegate.h',
         'browser/ui/views/ash/panel_view_aura.cc',
         'browser/ui/views/ash/panel_view_aura.h',
         'browser/ui/views/avatar_menu_bubble_view.cc',