Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 10828151: chrome: Copy app_list files from views/ to ash/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/views/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/launcher/launcher_types.h" 7 #include "ash/launcher/launcher_types.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "chrome/browser/chromeos/login/screen_locker.h" 11 #include "chrome/browser/chromeos/login/screen_locker.h"
12 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" 12 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
13 #include "chrome/browser/lifetime/application_lifetime.h" 13 #include "chrome/browser/lifetime/application_lifetime.h"
14 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/sessions/tab_restore_service.h" 15 #include "chrome/browser/sessions/tab_restore_service.h"
16 #include "chrome/browser/sessions/tab_restore_service_factory.h" 16 #include "chrome/browser/sessions/tab_restore_service_factory.h"
17 #include "chrome/browser/ui/ash/app_list/app_list_view_delegate.h"
17 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_commands.h" 19 #include "chrome/browser/ui/browser_commands.h"
19 #include "chrome/browser/ui/browser_finder.h" 20 #include "chrome/browser/ui/browser_finder.h"
20 #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h"
21 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h" 21 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
22 #include "chrome/browser/ui/views/ash/user_action_handler.h" 22 #include "chrome/browser/ui/views/ash/user_action_handler.h"
tfarina 2012/08/03 13:42:50 these two can also be moved to ui/ash. They do not
23 #include "chrome/browser/ui/views/ash/window_positioner.h" 23 #include "chrome/browser/ui/views/ash/window_positioner.h"
24 #include "chrome/browser/ui/views/frame/browser_view.h" 24 #include "chrome/browser/ui/views/frame/browser_view.h"
25 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" 25 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
26 #include "chrome/common/chrome_notification_types.h" 26 #include "chrome/common/chrome_notification_types.h"
27 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
29 #include "content/public/browser/notification_service.h" 29 #include "content/public/browser/notification_service.h"
30 #include "content/public/browser/user_metrics.h" 30 #include "content/public/browser/user_metrics.h"
31 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
32 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 ash::Shell::GetInstance()->ShowLauncher(); 368 ash::Shell::GetInstance()->ShowLauncher();
369 break; 369 break;
370 default: 370 default:
371 NOTREACHED() << "Unexpected notification " << type; 371 NOTREACHED() << "Unexpected notification " << type;
372 } 372 }
373 #else 373 #else
374 // MSVC++ warns about switch statements without any cases. 374 // MSVC++ warns about switch statements without any cases.
375 NOTREACHED() << "Unexpected notification " << type; 375 NOTREACHED() << "Unexpected notification " << type;
376 #endif 376 #endif
377 } 377 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698