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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
11 #include "ash/accelerators/magnifier_key_scroller.h" 11 #include "ash/accelerators/magnifier_key_scroller.h"
12 #include "ash/accelerators/spoken_feedback_toggler.h" 12 #include "ash/accelerators/spoken_feedback_toggler.h"
13 #include "ash/accessibility_delegate.h" 13 #include "ash/common/accessibility_delegate.h"
14 #include "ash/accessibility_types.h" 14 #include "ash/common/accessibility_types.h"
15 #include "ash/common/wallpaper/wallpaper_delegate.h"
16 #include "ash/common/wm_shell.h"
17 #include "ash/common/wm_window.h"
15 #include "ash/content/gpu_support_impl.h" 18 #include "ash/content/gpu_support_impl.h"
16 #include "ash/shell.h" 19 #include "ash/shell.h"
17 #include "ash/wallpaper/wallpaper_delegate.h"
18 #include "ash/wm/mru_window_tracker.h" 20 #include "ash/wm/mru_window_tracker.h"
19 #include "ash/wm/window_state.h" 21 #include "ash/wm/window_state.h"
20 #include "ash/wm/window_util.h" 22 #include "ash/wm/window_util.h"
21 #include "ash/wm_shell.h"
22 #include "ash/wm_window.h"
23 #include "base/command_line.h" 23 #include "base/command_line.h"
24 #include "base/macros.h" 24 #include "base/macros.h"
25 #include "base/memory/ptr_util.h" 25 #include "base/memory/ptr_util.h"
26 #include "build/build_config.h" 26 #include "build/build_config.h"
27 #include "chrome/browser/app_mode/app_mode_utils.h" 27 #include "chrome/browser/app_mode/app_mode_utils.h"
28 #include "chrome/browser/chrome_notification_types.h" 28 #include "chrome/browser/chrome_notification_types.h"
29 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 29 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
30 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 30 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
31 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_url_util.h " 31 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_url_util.h "
32 #include "chrome/browser/chromeos/background/ash_wallpaper_delegate.h" 32 #include "chrome/browser/chromeos/background/ash_wallpaper_delegate.h"
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 NOTREACHED() << "Unexpected notification " << type; 599 NOTREACHED() << "Unexpected notification " << type;
600 } 600 }
601 } 601 }
602 602
603 void ChromeShellDelegate::PlatformInit() { 603 void ChromeShellDelegate::PlatformInit() {
604 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 604 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
605 content::NotificationService::AllSources()); 605 content::NotificationService::AllSources());
606 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, 606 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
607 content::NotificationService::AllSources()); 607 content::NotificationService::AllSources());
608 } 608 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/ime_controller_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698