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

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

Issue 2778143002: More pre-MD cleanup (Closed)
Patch Set: update c/b Created 3 years, 8 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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 *session_start_time = session_start_time_; 408 *session_start_time = session_start_time_;
409 return have_session_start_time_; 409 return have_session_start_time_;
410 } 410 }
411 411
412 bool SystemTrayDelegateChromeOS::GetSessionLengthLimit( 412 bool SystemTrayDelegateChromeOS::GetSessionLengthLimit(
413 base::TimeDelta* session_length_limit) { 413 base::TimeDelta* session_length_limit) {
414 *session_length_limit = session_length_limit_; 414 *session_length_limit = session_length_limit_;
415 return have_session_length_limit_; 415 return have_session_length_limit_;
416 } 416 }
417 417
418 int SystemTrayDelegateChromeOS::GetSystemTrayMenuWidth() {
419 return l10n_util::GetLocalizedContentsWidthInPixels(
420 IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS);
421 }
422
423 void SystemTrayDelegateChromeOS::ActiveUserWasChanged() { 418 void SystemTrayDelegateChromeOS::ActiveUserWasChanged() {
424 SetProfile(ProfileManager::GetActiveUserProfile()); 419 SetProfile(ProfileManager::GetActiveUserProfile());
425 GetSystemTrayNotifier()->NotifyUserUpdate(); 420 GetSystemTrayNotifier()->NotifyUserUpdate();
426 } 421 }
427 422
428 bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() { 423 bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() {
429 return search_key_mapped_to_ == input_method::kCapsLockKey; 424 return search_key_mapped_to_ == input_method::kCapsLockKey;
430 } 425 }
431 426
432 void SystemTrayDelegateChromeOS::AddCustodianInfoTrayObserver( 427 void SystemTrayDelegateChromeOS::AddCustodianInfoTrayObserver(
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 784 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
790 << "ENABLE_SUPERVISED_USERS undefined."; 785 << "ENABLE_SUPERVISED_USERS undefined.";
791 return base::string16(); 786 return base::string16();
792 } 787 }
793 788
794 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 789 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
795 return new SystemTrayDelegateChromeOS(); 790 return new SystemTrayDelegateChromeOS();
796 } 791 }
797 792
798 } // namespace chromeos 793 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698