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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.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) 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 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 27 matching lines...) Expand all
38 #include "base/callback.h" 38 #include "base/callback.h"
39 #include "base/chromeos/chromeos_version.h" 39 #include "base/chromeos/chromeos_version.h"
40 #include "base/command_line.h" 40 #include "base/command_line.h"
41 #include "base/logging.h" 41 #include "base/logging.h"
42 #include "base/memory/weak_ptr.h" 42 #include "base/memory/weak_ptr.h"
43 #include "base/prefs/pref_service.h" 43 #include "base/prefs/pref_service.h"
44 #include "base/strings/stringprintf.h" 44 #include "base/strings/stringprintf.h"
45 #include "base/strings/utf_string_conversions.h" 45 #include "base/strings/utf_string_conversions.h"
46 #include "base/time/time.h" 46 #include "base/time/time.h"
47 #include "chrome/browser/browser_process.h" 47 #include "chrome/browser/browser_process.h"
48 #include "chrome/browser/chrome_notification_types.h"
48 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 49 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
49 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 50 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
50 #include "chrome/browser/chromeos/audio/audio_handler.h" 51 #include "chrome/browser/chromeos/audio/audio_handler.h"
51 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" 52 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
52 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" 53 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
53 #include "chrome/browser/chromeos/cros/cros_library.h" 54 #include "chrome/browser/chromeos/cros/cros_library.h"
54 #include "chrome/browser/chromeos/cros/network_library.h" 55 #include "chrome/browser/chromeos/cros/network_library.h"
55 #include "chrome/browser/chromeos/drive/drive_integration_service.h" 56 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
56 #include "chrome/browser/chromeos/drive/job_list.h" 57 #include "chrome/browser/chromeos/drive/job_list.h"
57 #include "chrome/browser/chromeos/input_method/input_method_util.h" 58 #include "chrome/browser/chromeos/input_method/input_method_util.h"
(...skipping 21 matching lines...) Expand all
79 #include "chrome/browser/policy/cloud/cloud_policy_store.h" 80 #include "chrome/browser/policy/cloud/cloud_policy_store.h"
80 #include "chrome/browser/profiles/profile_manager.h" 81 #include "chrome/browser/profiles/profile_manager.h"
81 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" 82 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
82 #include "chrome/browser/ui/browser.h" 83 #include "chrome/browser/ui/browser.h"
83 #include "chrome/browser/ui/browser_finder.h" 84 #include "chrome/browser/ui/browser_finder.h"
84 #include "chrome/browser/ui/chrome_pages.h" 85 #include "chrome/browser/ui/chrome_pages.h"
85 #include "chrome/browser/ui/host_desktop.h" 86 #include "chrome/browser/ui/host_desktop.h"
86 #include "chrome/browser/ui/singleton_tabs.h" 87 #include "chrome/browser/ui/singleton_tabs.h"
87 #include "chrome/browser/ui/tabs/tab_strip_model.h" 88 #include "chrome/browser/ui/tabs/tab_strip_model.h"
88 #include "chrome/browser/upgrade_detector.h" 89 #include "chrome/browser/upgrade_detector.h"
89 #include "chrome/common/chrome_notification_types.h"
90 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
91 #include "chrome/common/time_format.h" 91 #include "chrome/common/time_format.h"
92 #include "chrome/common/url_constants.h" 92 #include "chrome/common/url_constants.h"
93 #include "chromeos/chromeos_switches.h" 93 #include "chromeos/chromeos_switches.h"
94 #include "chromeos/dbus/dbus_thread_manager.h" 94 #include "chromeos/dbus/dbus_thread_manager.h"
95 #include "chromeos/dbus/power_manager_client.h" 95 #include "chromeos/dbus/power_manager_client.h"
96 #include "chromeos/dbus/session_manager_client.h" 96 #include "chromeos/dbus/session_manager_client.h"
97 #include "chromeos/dbus/system_clock_client.h" 97 #include "chromeos/dbus/system_clock_client.h"
98 #include "chromeos/ime/extension_ime_util.h" 98 #include "chromeos/ime/extension_ime_util.h"
99 #include "chromeos/ime/input_method_manager.h" 99 #include "chromeos/ime/input_method_manager.h"
(...skipping 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1361 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1362 }; 1362 };
1363 1363
1364 } // namespace 1364 } // namespace
1365 1365
1366 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1366 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1367 return new chromeos::SystemTrayDelegate(); 1367 return new chromeos::SystemTrayDelegate();
1368 } 1368 }
1369 1369
1370 } // namespace chromeos 1370 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698