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

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

Issue 23591028: [Cleanup] fix macro, comments and unused includes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update comment Created 7 years, 3 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
« no previous file with comments | « ash/root_window_settings.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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/ash_switches.h"
11 #include "ash/host/root_window_host_factory.h" 10 #include "ash/host/root_window_host_factory.h"
12 #include "ash/launcher/launcher_types.h"
13 #include "ash/magnifier/magnifier_constants.h" 11 #include "ash/magnifier/magnifier_constants.h"
14 #include "ash/session_state_delegate.h" 12 #include "ash/session_state_delegate.h"
15 #include "ash/shelf/shelf_widget.h"
16 #include "ash/system/tray/system_tray_delegate.h" 13 #include "ash/system/tray/system_tray_delegate.h"
17 #include "ash/wm/window_properties.h"
18 #include "ash/wm/window_util.h" 14 #include "ash/wm/window_util.h"
19 #include "base/bind.h"
20 #include "base/command_line.h" 15 #include "base/command_line.h"
21 #include "base/prefs/pref_service.h" 16 #include "base/prefs/pref_service.h"
22 #include "base/strings/utf_string_conversions.h"
23 #include "chrome/browser/app_mode/app_mode_utils.h" 17 #include "chrome/browser/app_mode/app_mode_utils.h"
24 #include "chrome/browser/chrome_notification_types.h"
25 #include "chrome/browser/lifetime/application_lifetime.h" 18 #include "chrome/browser/lifetime/application_lifetime.h"
26 #include "chrome/browser/profiles/profile_manager.h" 19 #include "chrome/browser/profiles/profile_manager.h"
27 #include "chrome/browser/sessions/tab_restore_service.h" 20 #include "chrome/browser/sessions/tab_restore_service.h"
28 #include "chrome/browser/sessions/tab_restore_service_factory.h" 21 #include "chrome/browser/sessions/tab_restore_service_factory.h"
29 #include "chrome/browser/sessions/tab_restore_service_observer.h" 22 #include "chrome/browser/sessions/tab_restore_service_observer.h"
30 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" 23 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
31 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" 24 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
32 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h" 25 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
33 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 26 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
34 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 27 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
35 #include "chrome/browser/ui/ash/user_action_handler.h" 28 #include "chrome/browser/ui/ash/user_action_handler.h"
36 #include "chrome/browser/ui/ash/window_positioner.h" 29 #include "chrome/browser/ui/ash/window_positioner.h"
37 #include "chrome/browser/ui/browser.h" 30 #include "chrome/browser/ui/browser.h"
38 #include "chrome/browser/ui/browser_commands.h" 31 #include "chrome/browser/ui/browser_commands.h"
39 #include "chrome/browser/ui/browser_finder.h" 32 #include "chrome/browser/ui/browser_finder.h"
40 #include "chrome/browser/ui/browser_window.h" 33 #include "chrome/browser/ui/browser_window.h"
41 #include "chrome/browser/ui/host_desktop.h" 34 #include "chrome/browser/ui/host_desktop.h"
42 #include "chrome/browser/ui/immersive_fullscreen_configuration.h"
43 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
44 #include "content/public/browser/notification_service.h"
45 #include "content/public/browser/user_metrics.h" 36 #include "content/public/browser/user_metrics.h"
46 #include "grit/chromium_strings.h" 37 #include "grit/chromium_strings.h"
47 #include "grit/generated_resources.h" 38 #include "grit/generated_resources.h"
48 #include "ui/aura/client/user_action_client.h"
49 #include "ui/aura/window.h" 39 #include "ui/aura/window.h"
50 #include "ui/base/l10n/l10n_util.h" 40 #include "ui/base/l10n/l10n_util.h"
51 41
52 #if defined(OS_CHROMEOS) 42 #if defined(OS_CHROMEOS)
53 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" 43 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h"
54 #endif 44 #endif
55 45
56 // static 46 // static
57 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; 47 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
58 48
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 return browser; 429 return browser;
440 return chrome::FindOrCreateTabbedBrowser( 430 return chrome::FindOrCreateTabbedBrowser(
441 ProfileManager::GetDefaultProfileOrOffTheRecord(), 431 ProfileManager::GetDefaultProfileOrOffTheRecord(),
442 chrome::HOST_DESKTOP_TYPE_ASH); 432 chrome::HOST_DESKTOP_TYPE_ASH);
443 } 433 }
444 434
445 keyboard::KeyboardControllerProxy* 435 keyboard::KeyboardControllerProxy*
446 ChromeShellDelegate::CreateKeyboardControllerProxy() { 436 ChromeShellDelegate::CreateKeyboardControllerProxy() {
447 return new AshKeyboardControllerProxy(); 437 return new AshKeyboardControllerProxy();
448 } 438 }
OLDNEW
« no previous file with comments | « ash/root_window_settings.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698