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

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

Issue 2091953002: mash: Move TrayTracing to //ash/common/system/chromeos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments 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
« no previous file with comments | « ash/system/chromeos/tray_tracing.h ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/tray_tracing.cc
diff --git a/ash/system/chromeos/tray_tracing.cc b/ash/system/chromeos/tray_tracing.cc
deleted file mode 100644
index 7918623f8bc22789a84343d819443a93f3f40b2c..0000000000000000000000000000000000000000
--- a/ash/system/chromeos/tray_tracing.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2013 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/tray_tracing.h"
-
-#include "ash/common/system/tray/actionable_view.h"
-#include "ash/common/system/tray/fixed_sized_image_view.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/wm_shell.h"
-#include "ash/shell.h"
-#include "ash/system/tray/system_tray.h"
-#include "ash/system/tray/system_tray_notifier.h"
-#include "grit/ash_resources.h"
-#include "grit/ash_strings.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/image/image.h"
-#include "ui/views/controls/image_view.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/layout/box_layout.h"
-
-namespace ash {
-namespace tray {
-
-class DefaultTracingView : public ActionableView {
- public:
- DefaultTracingView() {
- SetLayoutManager(new views::BoxLayout(
- views::BoxLayout::kHorizontal,
- kTrayPopupPaddingHorizontal, 0,
- kTrayPopupPaddingBetweenItems));
-
- ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- image_ = new FixedSizedImageView(0, kTrayPopupItemHeight);
- image_->SetImage(
- bundle.GetImageNamed(IDR_AURA_UBER_TRAY_TRACING).ToImageSkia());
- AddChildView(image_);
-
- label_ = new views::Label();
- label_->SetMultiLine(true);
- label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- label_->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_TRACING));
- AddChildView(label_);
- }
-
- ~DefaultTracingView() override {}
-
- private:
- // Overridden from ActionableView.
- bool PerformAction(const ui::Event& event) override {
- WmShell::Get()->system_tray_delegate()->ShowChromeSlow();
- return true;
- }
-
- views::ImageView* image_;
- views::Label* label_;
-
- DISALLOW_COPY_AND_ASSIGN(DefaultTracingView);
-};
-
-} // namespace tray
-
-////////////////////////////////////////////////////////////////////////////////
-// ash::TrayTracing
-
-TrayTracing::TrayTracing(SystemTray* system_tray)
- : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_TRACING),
- default_(NULL) {
- DCHECK(Shell::GetInstance()->delegate());
- DCHECK(system_tray);
- Shell::GetInstance()->system_tray_notifier()->AddTracingObserver(this);
-}
-
-TrayTracing::~TrayTracing() {
- Shell::GetInstance()->system_tray_notifier()->RemoveTracingObserver(this);
-}
-
-void TrayTracing::SetTrayIconVisible(bool visible) {
- if (tray_view())
- tray_view()->SetVisible(visible);
-}
-
-bool TrayTracing::GetInitialVisibility() {
- return false;
-}
-
-views::View* TrayTracing::CreateDefaultView(LoginStatus status) {
- CHECK(default_ == NULL);
- if (tray_view() && tray_view()->visible())
- default_ = new tray::DefaultTracingView();
- return default_;
-}
-
-views::View* TrayTracing::CreateDetailedView(LoginStatus status) {
- return NULL;
-}
-
-void TrayTracing::DestroyDefaultView() {
- default_ = NULL;
-}
-
-void TrayTracing::DestroyDetailedView() {
-}
-
-void TrayTracing::OnTracingModeChanged(bool value) {
- SetTrayIconVisible(value);
-}
-
-} // namespace ash
« no previous file with comments | « ash/system/chromeos/tray_tracing.h ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698