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

Side by Side Diff: ash/system/bluetooth/tray_bluetooth.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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
« no previous file with comments | « ash/system/audio/tray_volume.cc ('k') | ash/system/brightness/tray_brightness.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/bluetooth/tray_bluetooth.h" 5 #include "ash/system/bluetooth/tray_bluetooth.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "ash/system/tray/tray_constants.h" 10 #include "ash/system/tray/tray_constants.h"
11 #include "ash/system/tray/tray_details_view.h" 11 #include "ash/system/tray/tray_details_view.h"
12 #include "ash/system/tray/tray_item_more.h" 12 #include "ash/system/tray/tray_item_more.h"
13 #include "ash/system/tray/tray_views.h" 13 #include "ash/system/tray/tray_views.h"
14 #include "grit/ash_resources.h"
14 #include "grit/ash_strings.h" 15 #include "grit/ash_strings.h"
15 #include "grit/ui_resources.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/gfx/image/image.h" 18 #include "ui/gfx/image/image.h"
19 #include "ui/views/controls/image_view.h" 19 #include "ui/views/controls/image_view.h"
20 #include "ui/views/controls/label.h" 20 #include "ui/views/controls/label.h"
21 #include "ui/views/layout/box_layout.h" 21 #include "ui/views/layout/box_layout.h"
22 22
23 namespace { 23 namespace {
24 const int kDeviceListHeight = 276; 24 const int kDeviceListHeight = 276;
25 } 25 }
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 BluetoothDeviceList list; 229 BluetoothDeviceList list;
230 Shell::GetInstance()->tray_delegate()->GetAvailableBluetoothDevices(&list); 230 Shell::GetInstance()->tray_delegate()->GetAvailableBluetoothDevices(&list);
231 if (default_) 231 if (default_)
232 default_->UpdateLabel(); 232 default_->UpdateLabel();
233 else if (detailed_) 233 else if (detailed_)
234 detailed_->Update(list); 234 detailed_->Update(list);
235 } 235 }
236 236
237 } // namespace internal 237 } // namespace internal
238 } // namespace ash 238 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/audio/tray_volume.cc ('k') | ash/system/brightness/tray_brightness.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698