chrome/browser/chromeos/system/ash_system_tray_delegate.cc - Issue 10388181: Remove virtual keyboard support from input_method_descriptor.h.

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 10388181: Remove virtual keyboard support from input_method_descriptor.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review Created 8 years, 7 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/input_method/mock_input_method_manager.cc ('k') | chrome/browser/ui/webui/options2/language_options_handler2_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/shell_window_ids.h"	8 #include "ash/shell_window_ids.h"

9 #include "ash/system/audio/audio_observer.h"	9 #include "ash/system/audio/audio_observer.h"

10 #include "ash/system/bluetooth/bluetooth_observer.h"	10 #include "ash/system/bluetooth/bluetooth_observer.h"

(...skipping 17 matching lines...) Expand all Loading...
28 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"	28 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"

29 #include "chrome/browser/chromeos/audio/audio_handler.h"	29 #include "chrome/browser/chromeos/audio/audio_handler.h"

30 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"	30 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"

31 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"	31 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"

32 #include "chrome/browser/chromeos/cros/cros_library.h"	32 #include "chrome/browser/chromeos/cros/cros_library.h"

33 #include "chrome/browser/chromeos/cros/network_library.h"	33 #include "chrome/browser/chromeos/cros/network_library.h"

34 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"	34 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"

35 #include "chrome/browser/chromeos/gdata/gdata_util.h"	35 #include "chrome/browser/chromeos/gdata/gdata_util.h"

36 #include "chrome/browser/chromeos/input_method/input_method_manager.h"	36 #include "chrome/browser/chromeos/input_method/input_method_manager.h"

37 #include "chrome/browser/chromeos/input_method/input_method_util.h"	37 #include "chrome/browser/chromeos/input_method/input_method_util.h"

38 #include "chrome/browser/chromeos/input_method/input_method_whitelist.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_settings.h"	39 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

41 #include "chrome/browser/chromeos/login/base_login_display_host.h"	40 #include "chrome/browser/chromeos/login/base_login_display_host.h"

42 #include "chrome/browser/chromeos/login/login_display_host.h"	41 #include "chrome/browser/chromeos/login/login_display_host.h"

43 #include "chrome/browser/chromeos/login/message_bubble.h"	42 #include "chrome/browser/chromeos/login/message_bubble.h"

44 #include "chrome/browser/chromeos/login/user.h"	43 #include "chrome/browser/chromeos/login/user.h"

45 #include "chrome/browser/chromeos/login/user_manager.h"	44 #include "chrome/browser/chromeos/login/user_manager.h"

46 #include "chrome/browser/chromeos/mobile_config.h"	45 #include "chrome/browser/chromeos/mobile_config.h"

47 #include "chrome/browser/chromeos/status/data_promo_notification.h"	46 #include "chrome/browser/chromeos/status/data_promo_notification.h"

48 #include "chrome/browser/chromeos/status/network_menu.h"	47 #include "chrome/browser/chromeos/status/network_menu.h"

(...skipping 1164 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1213 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);	1212 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);

1214 };	1213 };

1215	1214

1216 } // namespace	1215 } // namespace

1217	1216

1218 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {	1217 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {

1219 return new chromeos::SystemTrayDelegate(tray);	1218 return new chromeos::SystemTrayDelegate(tray);

1220 }	1219 }

1221	1220

1222 } // namespace chromeos	1221 } // namespace chromeos

OLD	NEW