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

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

Issue 14949004: ash: Rename tray_views.{h,cc} to tray_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browsertest Created 7 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 | Annotate | Revision Log
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/brightness/tray_brightness.h" 5 #include "ash/system/brightness/tray_brightness.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/ash_constants.h" 8 #include "ash/ash_constants.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/brightness/brightness_control_delegate.h" 10 #include "ash/system/brightness/brightness_control_delegate.h"
11 #include "ash/system/tray/fixed_sized_image_view.h" 11 #include "ash/system/tray/fixed_sized_image_view.h"
12 #include "ash/system/tray/system_tray_delegate.h" 12 #include "ash/system/tray/system_tray_delegate.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_constants.h" 14 #include "ash/system/tray/tray_constants.h"
15 #include "ash/system/tray/tray_views.h"
16 #include "base/bind.h" 15 #include "base/bind.h"
17 #include "base/message_loop.h" 16 #include "base/message_loop.h"
18 #include "base/utf_string_conversions.h" 17 #include "base/utf_string_conversions.h"
19 #include "grit/ash_resources.h" 18 #include "grit/ash_resources.h"
20 #include "grit/ash_strings.h" 19 #include "grit/ash_strings.h"
21 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
22 #include "ui/gfx/image/image.h" 21 #include "ui/gfx/image/image.h"
23 #include "ui/views/controls/button/image_button.h" 22 #include "ui/views/controls/button/image_button.h"
24 #include "ui/views/controls/image_view.h" 23 #include "ui/views/controls/image_view.h"
25 #include "ui/views/controls/label.h" 24 #include "ui/views/controls/label.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 return; 210 return;
212 211
213 if (brightness_view_) 212 if (brightness_view_)
214 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); 213 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
215 else 214 else
216 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); 215 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
217 } 216 }
218 217
219 } // namespace internal 218 } // namespace internal
220 } // namespace ash 219 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698