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

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

Issue 12453011: Move InputMethodManager to chromeos/ime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/input_method_api.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) 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/shell.h" 10 #include "ash/shell.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/chromeos/boot_times_loader.h" 28 #include "chrome/browser/chromeos/boot_times_loader.h"
29 #include "chrome/browser/chromeos/contacts/contact_manager.h" 29 #include "chrome/browser/chromeos/contacts/contact_manager.h"
30 #include "chrome/browser/chromeos/cros/cros_library.h" 30 #include "chrome/browser/chromeos/cros/cros_library.h"
31 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" 31 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
32 #include "chrome/browser/chromeos/display/display_preferences.h" 32 #include "chrome/browser/chromeos/display/display_preferences.h"
33 #include "chrome/browser/chromeos/display/primary_display_switch_observer.h" 33 #include "chrome/browser/chromeos/display/primary_display_switch_observer.h"
34 #include "chrome/browser/chromeos/extensions/default_app_order.h" 34 #include "chrome/browser/chromeos/extensions/default_app_order.h"
35 #include "chrome/browser/chromeos/external_metrics.h" 35 #include "chrome/browser/chromeos/external_metrics.h"
36 #include "chrome/browser/chromeos/imageburner/burn_manager.h" 36 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
37 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 37 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
38 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
39 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 38 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
40 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" 39 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
41 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" 40 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 41 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
43 #include "chrome/browser/chromeos/login/authenticator.h" 42 #include "chrome/browser/chromeos/login/authenticator.h"
44 #include "chrome/browser/chromeos/login/login_utils.h" 43 #include "chrome/browser/chromeos/login/login_utils.h"
45 #include "chrome/browser/chromeos/login/login_wizard.h" 44 #include "chrome/browser/chromeos/login/login_wizard.h"
46 #include "chrome/browser/chromeos/login/screen_locker.h" 45 #include "chrome/browser/chromeos/login/screen_locker.h"
47 #include "chrome/browser/chromeos/login/user_manager.h" 46 #include "chrome/browser/chromeos/login/user_manager.h"
48 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 47 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #include "chrome/common/chrome_version_info.h" 83 #include "chrome/common/chrome_version_info.h"
85 #include "chrome/common/logging_chrome.h" 84 #include "chrome/common/logging_chrome.h"
86 #include "chrome/common/pref_names.h" 85 #include "chrome/common/pref_names.h"
87 #include "chromeos/chromeos_switches.h" 86 #include "chromeos/chromeos_switches.h"
88 #include "chromeos/cryptohome/async_method_caller.h" 87 #include "chromeos/cryptohome/async_method_caller.h"
89 #include "chromeos/dbus/dbus_thread_manager.h" 88 #include "chromeos/dbus/dbus_thread_manager.h"
90 #include "chromeos/dbus/power_manager_client.h" 89 #include "chromeos/dbus/power_manager_client.h"
91 #include "chromeos/dbus/session_manager_client.h" 90 #include "chromeos/dbus/session_manager_client.h"
92 #include "chromeos/disks/disk_mount_manager.h" 91 #include "chromeos/disks/disk_mount_manager.h"
93 #include "chromeos/display/output_configurator.h" 92 #include "chromeos/display/output_configurator.h"
93 #include "chromeos/ime/input_method_manager.h"
94 #include "chromeos/network/geolocation_handler.h" 94 #include "chromeos/network/geolocation_handler.h"
95 #include "chromeos/network/network_change_notifier_chromeos.h" 95 #include "chromeos/network/network_change_notifier_chromeos.h"
96 #include "chromeos/network/network_change_notifier_factory_chromeos.h" 96 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
97 #include "chromeos/network/network_configuration_handler.h" 97 #include "chromeos/network/network_configuration_handler.h"
98 #include "chromeos/network/network_event_log.h" 98 #include "chromeos/network/network_event_log.h"
99 #include "chromeos/network/network_state_handler.h" 99 #include "chromeos/network/network_state_handler.h"
100 #include "chromeos/power/power_state_override.h" 100 #include "chromeos/power/power_state_override.h"
101 #include "content/public/browser/browser_thread.h" 101 #include "content/public/browser/browser_thread.h"
102 #include "content/public/browser/notification_service.h" 102 #include "content/public/browser/notification_service.h"
103 #include "content/public/common/main_function_params.h" 103 #include "content/public/common/main_function_params.h"
(...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 return; 849 return;
850 850
851 // If failed to launch, go back to login screen. 851 // If failed to launch, go back to login screen.
852 LOG(ERROR) << "Failed to launch kiosk app. Fall back to login screen"; 852 LOG(ERROR) << "Failed to launch kiosk app. Fall back to login screen";
853 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile()); 853 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile());
854 854
855 // TODO(xiyuan): Show error message. 855 // TODO(xiyuan): Show error message.
856 } 856 }
857 857
858 } // namespace chromeos 858 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/input_method_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698