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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.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 | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/system_key_event_listener.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/chromeos/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 28 matching lines...) Expand all
39 #include "base/utf_string_conversions.h" 39 #include "base/utf_string_conversions.h"
40 #include "chrome/browser/browser_process.h" 40 #include "chrome/browser/browser_process.h"
41 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 41 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
42 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 42 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
43 #include "chrome/browser/chromeos/audio/audio_handler.h" 43 #include "chrome/browser/chromeos/audio/audio_handler.h"
44 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" 44 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
45 #include "chrome/browser/chromeos/cros/cros_library.h" 45 #include "chrome/browser/chromeos/cros/cros_library.h"
46 #include "chrome/browser/chromeos/cros/network_library.h" 46 #include "chrome/browser/chromeos/cros/network_library.h"
47 #include "chrome/browser/chromeos/drive/drive_system_service.h" 47 #include "chrome/browser/chromeos/drive/drive_system_service.h"
48 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 48 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
49 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
50 #include "chrome/browser/chromeos/input_method/input_method_util.h" 49 #include "chrome/browser/chromeos/input_method/input_method_util.h"
51 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 50 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
52 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 51 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
53 #include "chrome/browser/chromeos/login/base_login_display_host.h" 52 #include "chrome/browser/chromeos/login/base_login_display_host.h"
54 #include "chrome/browser/chromeos/login/help_app_launcher.h" 53 #include "chrome/browser/chromeos/login/help_app_launcher.h"
55 #include "chrome/browser/chromeos/login/login_display_host.h" 54 #include "chrome/browser/chromeos/login/login_display_host.h"
56 #include "chrome/browser/chromeos/login/user.h" 55 #include "chrome/browser/chromeos/login/user.h"
57 #include "chrome/browser/chromeos/login/user_manager.h" 56 #include "chrome/browser/chromeos/login/user_manager.h"
58 #include "chrome/browser/chromeos/mobile_config.h" 57 #include "chrome/browser/chromeos/mobile_config.h"
59 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 58 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
(...skipping 16 matching lines...) Expand all
76 #include "chrome/browser/ui/singleton_tabs.h" 75 #include "chrome/browser/ui/singleton_tabs.h"
77 #include "chrome/browser/upgrade_detector.h" 76 #include "chrome/browser/upgrade_detector.h"
78 #include "chrome/common/chrome_notification_types.h" 77 #include "chrome/common/chrome_notification_types.h"
79 #include "chrome/common/pref_names.h" 78 #include "chrome/common/pref_names.h"
80 #include "chrome/common/url_constants.h" 79 #include "chrome/common/url_constants.h"
81 #include "chromeos/chromeos_switches.h" 80 #include "chromeos/chromeos_switches.h"
82 #include "chromeos/dbus/dbus_thread_manager.h" 81 #include "chromeos/dbus/dbus_thread_manager.h"
83 #include "chromeos/dbus/power_manager_client.h" 82 #include "chromeos/dbus/power_manager_client.h"
84 #include "chromeos/dbus/session_manager_client.h" 83 #include "chromeos/dbus/session_manager_client.h"
85 #include "chromeos/dbus/system_clock_client.h" 84 #include "chromeos/dbus/system_clock_client.h"
85 #include "chromeos/ime/input_method_manager.h"
86 #include "content/public/browser/browser_thread.h" 86 #include "content/public/browser/browser_thread.h"
87 #include "content/public/browser/notification_observer.h" 87 #include "content/public/browser/notification_observer.h"
88 #include "content/public/browser/notification_service.h" 88 #include "content/public/browser/notification_service.h"
89 #include "content/public/browser/user_metrics.h" 89 #include "content/public/browser/user_metrics.h"
90 #include "device/bluetooth/bluetooth_adapter.h" 90 #include "device/bluetooth/bluetooth_adapter.h"
91 #include "device/bluetooth/bluetooth_adapter_factory.h" 91 #include "device/bluetooth/bluetooth_adapter_factory.h"
92 #include "device/bluetooth/bluetooth_device.h" 92 #include "device/bluetooth/bluetooth_device.h"
93 #include "grit/ash_strings.h" 93 #include "grit/ash_strings.h"
94 #include "grit/generated_resources.h" 94 #include "grit/generated_resources.h"
95 #include "ui/base/l10n/l10n_util.h" 95 #include "ui/base/l10n/l10n_util.h"
(...skipping 1375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1471 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1471 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1472 }; 1472 };
1473 1473
1474 } // namespace 1474 } // namespace
1475 1475
1476 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1476 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1477 return new chromeos::SystemTrayDelegate(); 1477 return new chromeos::SystemTrayDelegate();
1478 } 1478 }
1479 1479
1480 } // namespace chromeos 1480 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/system_key_event_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698