| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/ui/ash/system_tray_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 42 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
| 43 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h" | 43 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h" |
| 44 #include "chrome/browser/ui/ash/system_tray_client.h" | 44 #include "chrome/browser/ui/ash/system_tray_client.h" |
| 45 #include "chrome/browser/ui/browser.h" | 45 #include "chrome/browser/ui/browser.h" |
| 46 #include "chrome/browser/ui/browser_list.h" | 46 #include "chrome/browser/ui/browser_list.h" |
| 47 #include "chrome/browser/ui/chrome_pages.h" | 47 #include "chrome/browser/ui/chrome_pages.h" |
| 48 #include "chrome/common/chrome_switches.h" | 48 #include "chrome/common/chrome_switches.h" |
| 49 #include "chrome/common/features.h" | 49 #include "chrome/common/features.h" |
| 50 #include "chrome/common/pref_names.h" | 50 #include "chrome/common/pref_names.h" |
| 51 #include "chrome/grit/generated_resources.h" | 51 #include "chrome/grit/generated_resources.h" |
| 52 #include "chrome/grit/locale_settings.h" | |
| 53 #include "chromeos/login/login_state.h" | 52 #include "chromeos/login/login_state.h" |
| 54 #include "chromeos/network/portal_detector/network_portal_detector.h" | 53 #include "chromeos/network/portal_detector/network_portal_detector.h" |
| 55 #include "components/google/core/browser/google_util.h" | 54 #include "components/google/core/browser/google_util.h" |
| 56 #include "components/prefs/pref_service.h" | 55 #include "components/prefs/pref_service.h" |
| 57 #include "components/session_manager/core/session_manager.h" | 56 #include "components/session_manager/core/session_manager.h" |
| 58 #include "components/user_manager/user.h" | 57 #include "components/user_manager/user.h" |
| 59 #include "components/user_manager/user_manager.h" | 58 #include "components/user_manager/user_manager.h" |
| 60 #include "components/user_manager/user_type.h" | 59 #include "components/user_manager/user_type.h" |
| 61 #include "content/public/browser/notification_observer.h" | 60 #include "content/public/browser/notification_observer.h" |
| 62 #include "content/public/browser/notification_service.h" | 61 #include "content/public/browser/notification_service.h" |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 | 504 |
| 506 void SystemTrayDelegateChromeOS::ImeMenuItemsChanged( | 505 void SystemTrayDelegateChromeOS::ImeMenuItemsChanged( |
| 507 const std::string& engine_id, | 506 const std::string& engine_id, |
| 508 const std::vector<input_method::InputMethodManager::MenuItem>& items) {} | 507 const std::vector<input_method::InputMethodManager::MenuItem>& items) {} |
| 509 | 508 |
| 510 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 509 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 511 return new SystemTrayDelegateChromeOS(); | 510 return new SystemTrayDelegateChromeOS(); |
| 512 } | 511 } |
| 513 | 512 |
| 514 } // namespace chromeos | 513 } // namespace chromeos |
| OLD | NEW |