ash/system/tray_tracing.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/tray_tracing.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase 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 side-by-side diff with in-line comments

Download patch

Index: ash/system/tray_tracing.cc

diff --git a/ash/common/system/chromeos/tray_tracing.cc b/ash/system/tray_tracing.cc

similarity index 85%

rename from ash/common/system/chromeos/tray_tracing.cc

rename to ash/system/tray_tracing.cc

index cce4bce5dedd474d86f5e4397adc01a207f64da5..e2c14a93575bc953ba2890ce0fb831fe0f8176ba 100644

--- a/ash/common/system/chromeos/tray_tracing.cc

+++ b/ash/system/tray_tracing.cc

@@ -2,21 +2,21 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/common/system/chromeos/tray_tracing.h"

+#include "ash/system/tray_tracing.h"

#include "ash/common/metrics/user_metrics_action.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.h"

-#include "ash/common/system/tray/system_tray_controller.h"

-#include "ash/common/system/tray/system_tray_notifier.h"

-#include "ash/common/system/tray/tray_constants.h"

-#include "ash/common/system/tray/tray_popup_item_style.h"

-#include "ash/common/system/tray/tray_popup_utils.h"

-#include "ash/common/system/tray/tri_view.h"

#include "ash/common/wm_shell.h"

#include "ash/resources/vector_icons/vector_icons.h"

#include "ash/strings/grit/ash_strings.h"

+#include "ash/system/tray/actionable_view.h"

+#include "ash/system/tray/fixed_sized_image_view.h"

+#include "ash/system/tray/system_tray.h"

+#include "ash/system/tray/system_tray_controller.h"

+#include "ash/system/tray/system_tray_notifier.h"

+#include "ash/system/tray/tray_constants.h"

+#include "ash/system/tray/tray_popup_item_style.h"

+#include "ash/system/tray/tray_popup_utils.h"

+#include "ash/system/tray/tri_view.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/gfx/image/image.h"

#include "ui/gfx/paint_vector_icon.h"

« no previous file with comments | « ash/system/tray_tracing.h ('k') | ash/system/update/tray_update.h » ('j') | no next file with comments »