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

Side by Side Diff: ash/system/date/tray_system_info.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/system/ime_menu/ime_menu_tray.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/system/date/tray_system_info.h" 5 #include "ash/system/date/tray_system_info.h"
6 6
7 #include "ash/shelf/wm_shelf.h" 7 #include "ash/shelf/shelf.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/date/date_view.h" 9 #include "ash/system/date/date_view.h"
10 #include "ash/system/date/system_info_default_view.h" 10 #include "ash/system/date/system_info_default_view.h"
11 #include "ash/system/system_clock_observer.h" 11 #include "ash/system/system_clock_observer.h"
12 #include "ash/system/tray/system_tray.h" 12 #include "ash/system/tray/system_tray.h"
13 #include "ash/system/tray/system_tray_notifier.h" 13 #include "ash/system/tray/system_tray_notifier.h"
14 #include "ash/system/tray/tray_item_view.h" 14 #include "ash/system/tray/tray_item_view.h"
15 15
16 namespace ash { 16 namespace ash {
17 17
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 } 104 }
105 105
106 void TraySystemInfo::UpdateTimeFormat() { 106 void TraySystemInfo::UpdateTimeFormat() {
107 if (tray_view_) 107 if (tray_view_)
108 tray_view_->UpdateTimeFormat(); 108 tray_view_->UpdateTimeFormat();
109 if (default_view_) 109 if (default_view_)
110 default_view_->GetDateView()->UpdateTimeFormat(); 110 default_view_->GetDateView()->UpdateTimeFormat();
111 } 111 }
112 112
113 } // namespace ash 113 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/system/ime_menu/ime_menu_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698