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

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

Issue 10829375: Cleanup: separate WAPI and Drive API code in gdata_documents_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix for comments Created 8 years, 4 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) 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
28 #include "base/logging.h" 28 #include "base/logging.h"
29 #include "base/memory/weak_ptr.h" 29 #include "base/memory/weak_ptr.h"
30 #include "base/utf_string_conversions.h" 30 #include "base/utf_string_conversions.h"
31 #include "chrome/browser/browser_process.h" 31 #include "chrome/browser/browser_process.h"
32 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 32 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
33 #include "chrome/browser/chromeos/audio/audio_handler.h" 33 #include "chrome/browser/chromeos/audio/audio_handler.h"
34 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h" 34 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
35 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h" 35 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
36 #include "chrome/browser/chromeos/cros/cros_library.h" 36 #include "chrome/browser/chromeos/cros/cros_library.h"
37 #include "chrome/browser/chromeos/cros/network_library.h" 37 #include "chrome/browser/chromeos/cros/network_library.h"
38 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h" 38 #include "chrome/browser/chromeos/gdata/documents_service_interface.h"
39 #include "chrome/browser/chromeos/gdata/gdata_operation_registry.h" 39 #include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
40 #include "chrome/browser/chromeos/gdata/gdata_system_service.h" 40 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
41 #include "chrome/browser/chromeos/gdata/gdata_util.h" 41 #include "chrome/browser/chromeos/gdata/gdata_util.h"
42 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 42 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
43 #include "chrome/browser/chromeos/input_method/input_method_util.h" 43 #include "chrome/browser/chromeos/input_method/input_method_util.h"
44 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 44 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
45 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 45 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
46 #include "chrome/browser/chromeos/login/base_login_display_host.h" 46 #include "chrome/browser/chromeos/login/base_login_display_host.h"
47 #include "chrome/browser/chromeos/login/login_display_host.h" 47 #include "chrome/browser/chromeos/login/login_display_host.h"
48 #include "chrome/browser/chromeos/login/message_bubble.h" 48 #include "chrome/browser/chromeos/login/message_bubble.h"
(...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1254 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1255 }; 1255 };
1256 1256
1257 } // namespace 1257 } // namespace
1258 1258
1259 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 1259 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
1260 return new chromeos::SystemTrayDelegate(tray); 1260 return new chromeos::SystemTrayDelegate(tray);
1261 } 1261 }
1262 1262
1263 } // namespace chromeos 1263 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/gdata/mock_gdata_documents_service.cc ('k') | chrome/browser/ui/webui/chromeos/drive_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698