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

Side by Side Diff: ash/system/status_area_widget.cc

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/system/overview/overview_button_tray_unittest.cc ('k') | ash/system/tray/system_tray.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/status_area_widget.h" 5 #include "ash/system/status_area_widget.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shelf/shelf_widget.h" 9 #include "ash/shelf/shelf_widget.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_delegate.h" 11 #include "ash/shell_delegate.h"
12 #include "ash/shell_window_ids.h" 12 #include "ash/shell_window_ids.h"
13 #include "ash/system/bluetooth/bluetooth_observer.h" 13 #include "ash/system/bluetooth/bluetooth_observer.h"
14 #include "ash/system/overview/overview_button_tray.h" 14 #include "ash/system/overview/overview_button_tray.h"
15 #include "ash/system/status_area_widget_delegate.h" 15 #include "ash/system/status_area_widget_delegate.h"
16 #include "ash/system/tray/system_tray.h" 16 #include "ash/system/tray/system_tray.h"
17 #include "ash/system/tray/system_tray_delegate.h" 17 #include "ash/system/tray/system_tray_delegate.h"
18 #include "ash/system/web_notification/web_notification_tray.h" 18 #include "ash/system/web_notification/web_notification_tray.h"
19 #include "ash/wm/window_properties.h" 19 #include "ash/wm/window_properties.h"
20 #include "base/i18n/time_formatting.h" 20 #include "base/i18n/time_formatting.h"
21 #include "ui/aura/window.h" 21 #include "ui/aura/window.h"
22 #include "ui/gfx/screen.h"
23 22
24 #if defined(OS_CHROMEOS) 23 #if defined(OS_CHROMEOS)
25 #include "ash/system/chromeos/session/logout_button_tray.h" 24 #include "ash/system/chromeos/session/logout_button_tray.h"
26 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" 25 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
27 #endif 26 #endif
28 27
29 namespace ash { 28 namespace ash {
30 29
31 const char StatusAreaWidget::kNativeViewName[] = "StatusAreaWidget"; 30 const char StatusAreaWidget::kNativeViewName[] = "StatusAreaWidget";
32 31
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); 195 web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
197 #if defined(OS_CHROMEOS) 196 #if defined(OS_CHROMEOS)
198 if (logout_button_tray_) 197 if (logout_button_tray_)
199 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); 198 logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
200 #endif 199 #endif
201 if (overview_button_tray_) 200 if (overview_button_tray_)
202 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); 201 overview_button_tray_->UpdateAfterLoginStatusChange(login_status);
203 } 202 }
204 203
205 } // namespace ash 204 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/overview/overview_button_tray_unittest.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698