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

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

Issue 2696033003: [Ash MD] Remove some non-MD code from HoverHighlightView (Closed)
Patch Set: Created 3 years, 10 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 (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/common/system/chromeos/bluetooth/tray_bluetooth.h" 5 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
6 6
7 #include "ash/common/session/session_state_delegate.h" 7 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/common/system/tray/hover_highlight_view.h" 8 #include "ash/common/system/tray/hover_highlight_view.h"
9 #include "ash/common/system/tray/system_tray.h" 9 #include "ash/common/system/tray/system_tray.h"
10 #include "ash/common/system/tray/system_tray_delegate.h" 10 #include "ash/common/system/tray/system_tray_delegate.h"
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 HoverHighlightView* AddScrollListItem(const base::string16& text, 341 HoverHighlightView* AddScrollListItem(const base::string16& text,
342 const gfx::ImageSkia& image, 342 const gfx::ImageSkia& image,
343 bool connected, 343 bool connected,
344 bool connecting) { 344 bool connecting) {
345 HoverHighlightView* container = new HoverHighlightView(this); 345 HoverHighlightView* container = new HoverHighlightView(this);
346 if (connected) { 346 if (connected) {
347 SetupConnectedItem(container, text, image); 347 SetupConnectedItem(container, text, image);
348 } else if (connecting) { 348 } else if (connecting) {
349 SetupConnectingItem(container, text, image); 349 SetupConnectingItem(container, text, image);
350 } else { 350 } else {
351 container->AddIconAndLabel(image, text, false); 351 container->AddIconAndLabel(image, text);
352 } 352 }
353 scroll_content()->AddChildView(container); 353 scroll_content()->AddChildView(container);
354 return container; 354 return container;
355 } 355 }
356 356
357 void AddSubHeader(int message_id) { 357 void AddSubHeader(int message_id) {
358 TriView* header = TrayPopupUtils::CreateSubHeaderRowView(); 358 TriView* header = TrayPopupUtils::CreateSubHeaderRowView();
359 TrayPopupUtils::ConfigureAsStickyHeader(header); 359 TrayPopupUtils::ConfigureAsStickyHeader(header);
360 360
361 views::Label* label = TrayPopupUtils::CreateDefaultLabel(); 361 views::Label* label = TrayPopupUtils::CreateDefaultLabel();
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 detailed_->Update(); 618 detailed_->Update();
619 } 619 }
620 620
621 void TrayBluetooth::OnBluetoothDiscoveringChanged() { 621 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
622 if (!detailed_) 622 if (!detailed_)
623 return; 623 return;
624 detailed_->Update(); 624 detailed_->Update();
625 } 625 }
626 626
627 } // namespace ash 627 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698