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

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

Issue 2448373002: chromeos: Move ownership of system tray width from chrome to ash (Closed)
Patch Set: Created 4 years, 1 month 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 <set> 10 #include <set>
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 *session_start_time = session_start_time_; 601 *session_start_time = session_start_time_;
602 return have_session_start_time_; 602 return have_session_start_time_;
603 } 603 }
604 604
605 bool SystemTrayDelegateChromeOS::GetSessionLengthLimit( 605 bool SystemTrayDelegateChromeOS::GetSessionLengthLimit(
606 base::TimeDelta* session_length_limit) { 606 base::TimeDelta* session_length_limit) {
607 *session_length_limit = session_length_limit_; 607 *session_length_limit = session_length_limit_;
608 return have_session_length_limit_; 608 return have_session_length_limit_;
609 } 609 }
610 610
611 int SystemTrayDelegateChromeOS::GetSystemTrayMenuWidth() {
612 return l10n_util::GetLocalizedContentsWidthInPixels(
613 IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS);
614 }
615
616 void SystemTrayDelegateChromeOS::ActiveUserWasChanged() { 611 void SystemTrayDelegateChromeOS::ActiveUserWasChanged() {
617 SetProfile(ProfileManager::GetActiveUserProfile()); 612 SetProfile(ProfileManager::GetActiveUserProfile());
618 GetSystemTrayNotifier()->NotifyUserUpdate(); 613 GetSystemTrayNotifier()->NotifyUserUpdate();
619 } 614 }
620 615
621 bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() { 616 bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() {
622 return search_key_mapped_to_ == input_method::kCapsLockKey; 617 return search_key_mapped_to_ == input_method::kCapsLockKey;
623 } 618 }
624 619
625 void SystemTrayDelegateChromeOS::AddCustodianInfoTrayObserver( 620 void SystemTrayDelegateChromeOS::AddCustodianInfoTrayObserver(
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1102 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1108 << "ENABLE_SUPERVISED_USERS undefined."; 1103 << "ENABLE_SUPERVISED_USERS undefined.";
1109 return base::string16(); 1104 return base::string16();
1110 } 1105 }
1111 1106
1112 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1107 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1113 return new SystemTrayDelegateChromeOS(); 1108 return new SystemTrayDelegateChromeOS();
1114 } 1109 }
1115 1110
1116 } // namespace chromeos 1111 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698