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

Side by Side Diff: ash/system/chromeos/brightness/tray_brightness.cc

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 5 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 "ash/system/chromeos/brightness/tray_brightness.h" 5 #include "ash/system/chromeos/brightness/tray_brightness.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/accelerators/accelerator_controller.h" 9 #include "ash/accelerators/accelerator_controller.h"
10 #include "ash/common/ash_constants.h" 10 #include "ash/common/ash_constants.h"
11 #include "ash/common/shell_observer.h" 11 #include "ash/common/shell_observer.h"
12 #include "ash/common/system/tray/fixed_sized_image_view.h" 12 #include "ash/common/system/tray/fixed_sized_image_view.h"
13 #include "ash/common/system/tray/system_tray_delegate.h" 13 #include "ash/common/system/tray/system_tray_delegate.h"
14 #include "ash/common/system/tray/tray_constants.h" 14 #include "ash/common/system/tray/tray_constants.h"
15 #include "ash/common/wm_shell.h" 15 #include "ash/common/wm_shell.h"
16 #include "ash/shell.h" 16 #include "ash/shell.h"
17 #include "ash/system/brightness_control_delegate.h" 17 #include "ash/system/brightness_control_delegate.h"
18 #include "ash/system/tray/system_tray_notifier.h"
19 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 18 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
20 #include "base/bind.h" 19 #include "base/bind.h"
21 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
22 #include "base/threading/thread_task_runner_handle.h" 21 #include "base/threading/thread_task_runner_handle.h"
23 #include "chromeos/dbus/dbus_thread_manager.h" 22 #include "chromeos/dbus/dbus_thread_manager.h"
24 #include "chromeos/dbus/power_manager_client.h" 23 #include "chromeos/dbus/power_manager_client.h"
25 #include "grit/ash_resources.h" 24 #include "grit/ash_resources.h"
26 #include "grit/ash_strings.h" 25 #include "grit/ash_strings.h"
27 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/display/display.h" 27 #include "ui/display/display.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 if (!display::Display::HasInternalDisplay()) 272 if (!display::Display::HasInternalDisplay())
274 return; 273 return;
275 274
276 if (brightness_view_) 275 if (brightness_view_)
277 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); 276 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
278 else 277 else
279 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); 278 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
280 } 279 }
281 280
282 } // namespace ash 281 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698