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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2771233002: Remove the wrapper functions content::RecordAction et al (Closed)
Patch Set: Rebased Created 3 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
OLDNEW
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "chromeos/network/portal_detector/network_portal_detector.h" 68 #include "chromeos/network/portal_detector/network_portal_detector.h"
69 #include "components/google/core/browser/google_util.h" 69 #include "components/google/core/browser/google_util.h"
70 #include "components/policy/core/common/cloud/cloud_policy_store.h" 70 #include "components/policy/core/common/cloud/cloud_policy_store.h"
71 #include "components/prefs/pref_service.h" 71 #include "components/prefs/pref_service.h"
72 #include "components/session_manager/core/session_manager.h" 72 #include "components/session_manager/core/session_manager.h"
73 #include "components/user_manager/user.h" 73 #include "components/user_manager/user.h"
74 #include "components/user_manager/user_manager.h" 74 #include "components/user_manager/user_manager.h"
75 #include "components/user_manager/user_type.h" 75 #include "components/user_manager/user_type.h"
76 #include "content/public/browser/notification_observer.h" 76 #include "content/public/browser/notification_observer.h"
77 #include "content/public/browser/notification_service.h" 77 #include "content/public/browser/notification_service.h"
78 #include "content/public/browser/user_metrics.h"
79 #include "ui/base/ime/chromeos/extension_ime_util.h" 78 #include "ui/base/ime/chromeos/extension_ime_util.h"
80 #include "ui/base/ime/chromeos/input_method_manager.h" 79 #include "ui/base/ime/chromeos/input_method_manager.h"
81 #include "ui/base/l10n/l10n_util.h" 80 #include "ui/base/l10n/l10n_util.h"
82 #include "ui/base/l10n/time_format.h" 81 #include "ui/base/l10n/time_format.h"
83 #include "ui/chromeos/events/pref_names.h" 82 #include "ui/chromeos/events/pref_names.h"
84 #include "ui/chromeos/ime/input_method_menu_item.h" 83 #include "ui/chromeos/ime/input_method_menu_item.h"
85 #include "ui/chromeos/ime/input_method_menu_manager.h" 84 #include "ui/chromeos/ime/input_method_menu_manager.h"
86 85
87 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) 86 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
88 #include "chrome/browser/supervised_user/supervised_user_service.h" 87 #include "chrome/browser/supervised_user/supervised_user_service.h"
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 789 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
791 << "ENABLE_SUPERVISED_USERS undefined."; 790 << "ENABLE_SUPERVISED_USERS undefined.";
792 return base::string16(); 791 return base::string16();
793 } 792 }
794 793
795 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 794 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
796 return new SystemTrayDelegateChromeOS(); 795 return new SystemTrayDelegateChromeOS();
797 } 796 }
798 797
799 } // namespace chromeos 798 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_client.cc ('k') | chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698