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

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: comment about DIPS 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
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 *session_start_time = session_start_time_; 602 *session_start_time = session_start_time_;
603 return have_session_start_time_; 603 return have_session_start_time_;
604 } 604 }
605 605
606 bool SystemTrayDelegateChromeOS::GetSessionLengthLimit( 606 bool SystemTrayDelegateChromeOS::GetSessionLengthLimit(
607 base::TimeDelta* session_length_limit) { 607 base::TimeDelta* session_length_limit) {
608 *session_length_limit = session_length_limit_; 608 *session_length_limit = session_length_limit_;
609 return have_session_length_limit_; 609 return have_session_length_limit_;
610 } 610 }
611 611
612 int SystemTrayDelegateChromeOS::GetSystemTrayMenuWidth() {
613 return l10n_util::GetLocalizedContentsWidthInPixels(
614 IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS);
615 }
616
617 void SystemTrayDelegateChromeOS::ActiveUserWasChanged() { 612 void SystemTrayDelegateChromeOS::ActiveUserWasChanged() {
618 SetProfile(ProfileManager::GetActiveUserProfile()); 613 SetProfile(ProfileManager::GetActiveUserProfile());
619 GetSystemTrayNotifier()->NotifyUserUpdate(); 614 GetSystemTrayNotifier()->NotifyUserUpdate();
620 } 615 }
621 616
622 bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() { 617 bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() {
623 return search_key_mapped_to_ == input_method::kCapsLockKey; 618 return search_key_mapped_to_ == input_method::kCapsLockKey;
624 } 619 }
625 620
626 void SystemTrayDelegateChromeOS::AddCustodianInfoTrayObserver( 621 void SystemTrayDelegateChromeOS::AddCustodianInfoTrayObserver(
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1103 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1109 << "ENABLE_SUPERVISED_USERS undefined."; 1104 << "ENABLE_SUPERVISED_USERS undefined.";
1110 return base::string16(); 1105 return base::string16();
1111 } 1106 }
1112 1107
1113 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1108 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1114 return new SystemTrayDelegateChromeOS(); 1109 return new SystemTrayDelegateChromeOS();
1115 } 1110 }
1116 1111
1117 } // namespace chromeos 1112 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698