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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 18640003: Updates some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/chromeos/chromeos_version.h" 14 #include "base/chromeos/chromeos_version.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/lazy_instance.h" 17 #include "base/lazy_instance.h"
18 #include "base/linux_util.h" 18 #include "base/linux_util.h"
19 #include "base/message_loop.h" 19 #include "base/message_loop.h"
20 #include "base/path_service.h" 20 #include "base/path_service.h"
21 #include "base/prefs/pref_service.h" 21 #include "base/prefs/pref_service.h"
22 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/string_split.h" 23 #include "base/strings/string_split.h"
24 #include "chrome/browser/browser_process.h" 24 #include "chrome/browser/browser_process.h"
25 #include "chrome/browser/browser_process_platform_part_chromeos.h" 25 #include "chrome/browser/browser_process_platform_part_chromeos.h"
26 #include "chrome/browser/chrome_notification_types.h"
26 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
27 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
28 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 29 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
29 #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h" 30 #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h"
30 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 31 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
31 #include "chrome/browser/chromeos/audio/audio_handler.h" 32 #include "chrome/browser/chromeos/audio/audio_handler.h"
32 #include "chrome/browser/chromeos/boot_times_loader.h" 33 #include "chrome/browser/chromeos/boot_times_loader.h"
33 #include "chrome/browser/chromeos/contacts/contact_manager.h" 34 #include "chrome/browser/chromeos/contacts/contact_manager.h"
34 #include "chrome/browser/chromeos/cros/cert_library.h" 35 #include "chrome/browser/chromeos/cros/cert_library.h"
35 #include "chrome/browser/chromeos/cros/cros_library.h" 36 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 79 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
79 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 80 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
80 #include "chrome/browser/defaults.h" 81 #include "chrome/browser/defaults.h"
81 #include "chrome/browser/metrics/metrics_service.h" 82 #include "chrome/browser/metrics/metrics_service.h"
82 #include "chrome/browser/net/chrome_network_delegate.h" 83 #include "chrome/browser/net/chrome_network_delegate.h"
83 #include "chrome/browser/policy/browser_policy_connector.h" 84 #include "chrome/browser/policy/browser_policy_connector.h"
84 #include "chrome/browser/profiles/profile.h" 85 #include "chrome/browser/profiles/profile.h"
85 #include "chrome/browser/profiles/profile_manager.h" 86 #include "chrome/browser/profiles/profile_manager.h"
86 #include "chrome/browser/rlz/rlz.h" 87 #include "chrome/browser/rlz/rlz.h"
87 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h" 88 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h"
88 #include "chrome/common/chrome_notification_types.h"
89 #include "chrome/common/chrome_paths.h" 89 #include "chrome/common/chrome_paths.h"
90 #include "chrome/common/chrome_switches.h" 90 #include "chrome/common/chrome_switches.h"
91 #include "chrome/common/chrome_version_info.h" 91 #include "chrome/common/chrome_version_info.h"
92 #include "chrome/common/logging_chrome.h" 92 #include "chrome/common/logging_chrome.h"
93 #include "chrome/common/pref_names.h" 93 #include "chrome/common/pref_names.h"
94 #include "chromeos/audio/audio_devices_pref_handler.h" 94 #include "chromeos/audio/audio_devices_pref_handler.h"
95 #include "chromeos/audio/audio_pref_handler.h" 95 #include "chromeos/audio/audio_pref_handler.h"
96 #include "chromeos/audio/cras_audio_handler.h" 96 #include "chromeos/audio/cras_audio_handler.h"
97 #include "chromeos/chromeos_paths.h" 97 #include "chromeos/chromeos_paths.h"
98 #include "chromeos/chromeos_switches.h" 98 #include "chromeos/chromeos_switches.h"
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 851 ChromeBrowserMainPartsLinux::PostDestroyThreads();
852 // Destroy DeviceSettingsService after g_browser_process. 852 // Destroy DeviceSettingsService after g_browser_process.
853 DeviceSettingsService::Shutdown(); 853 DeviceSettingsService::Shutdown();
854 } 854 }
855 855
856 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { 856 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() {
857 default_pinned_apps_field_trial::SetupTrial(); 857 default_pinned_apps_field_trial::SetupTrial();
858 } 858 }
859 859
860 } // namespace chromeos 860 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/boot_times_loader.cc ('k') | chrome/browser/chromeos/contacts/contact_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698