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

Unified Diff: ash/system/chromeos/label_tray_view.cc

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments, fix mash_unittests Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: ash/system/chromeos/label_tray_view.cc
diff --git a/ash/system/chromeos/label_tray_view.cc b/ash/system/chromeos/label_tray_view.cc
deleted file mode 100644
index dc73b9e77300e4e475e6d31a13f032a30eacddd1..0000000000000000000000000000000000000000
--- a/ash/system/chromeos/label_tray_view.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/system/chromeos/label_tray_view.h"
-
-#include "ash/common/system/tray/hover_highlight_view.h"
-#include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/system/tray/view_click_listener.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/font.h"
-#include "ui/views/border.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/layout/fill_layout.h"
-
-namespace ash {
-
-LabelTrayView::LabelTrayView(ViewClickListener* click_listener,
- int icon_resource_id)
- : click_listener_(click_listener), icon_resource_id_(icon_resource_id) {
- SetLayoutManager(new views::FillLayout());
- SetVisible(false);
-}
-
-LabelTrayView::~LabelTrayView() {}
-
-void LabelTrayView::SetMessage(const base::string16& message) {
- if (message_ == message)
- return;
-
- message_ = message;
- RemoveAllChildViews(true);
- if (!message_.empty()) {
- AddChildView(CreateChildView(message_));
- SetVisible(true);
- } else {
- SetVisible(false);
- }
-}
-
-views::View* LabelTrayView::CreateChildView(
- const base::string16& message) const {
- HoverHighlightView* child = new HoverHighlightView(click_listener_);
- if (icon_resource_id_) {
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- const gfx::ImageSkia* icon = rb.GetImageSkiaNamed(icon_resource_id_);
- child->AddIconAndLabel(*icon, message, false /* highlight */);
- child->SetBorder(views::Border::CreateEmptyBorder(
- 0, kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingHorizontal));
- child->text_label()->SetMultiLine(true);
- child->text_label()->SizeToFit(kTrayNotificationContentsWidth);
- } else {
- child->AddLabel(message, gfx::ALIGN_LEFT, false /* highlight */);
- child->text_label()->SetMultiLine(true);
- child->text_label()->SizeToFit(kTrayNotificationContentsWidth +
- kNotificationIconWidth);
- }
- child->text_label()->SetAllowCharacterBreak(true);
- child->SetExpandable(true);
- child->SetVisible(true);
- return child;
-}
-
-} // namespace ash
« no previous file with comments | « ash/system/chromeos/label_tray_view.h ('k') | ash/system/chromeos/session/last_window_closed_logout_reminder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698