ash/system/media_security/multi_profile_media_tray_item.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/media_security/multi_profile_media_tray_item.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:

Index: ash/system/media_security/multi_profile_media_tray_item.cc

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

similarity index 90%

rename from ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc

rename to ash/system/media_security/multi_profile_media_tray_item.cc

index 0029822e5b8bae303e11301f9a6210ce3583a650..be37005adb31631548715dd29a84bec16506e7ca 100644

--- a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc

+++ b/ash/system/media_security/multi_profile_media_tray_item.cc

@@ -2,17 +2,17 @@

// 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/media_security/multi_profile_media_tray_item.h"

+#include "ash/system/media_security/multi_profile_media_tray_item.h"

#include "ash/common/ash_view_ids.h"

#include "ash/common/media_controller.h"

#include "ash/common/session/session_state_delegate.h"

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

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

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

#include "ash/common/wm_shell.h"

#include "ash/resources/grit/ash_resources.h"

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

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

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

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

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/paint_vector_icon.h"

#include "ui/views/controls/image_view.h"