ash/system/screen_security/screen_share_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/screen_security/screen_share_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/screen_security/screen_share_tray_item.cc

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

similarity index 94%

rename from ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

rename to ash/system/screen_security/screen_share_tray_item.cc

index 61d26325b959cc9ea67bced7ef0999ae4f162a44..dc06e7f36973cc73135b94075a0622f36c1280d4 100644

--- a/ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

+++ b/ash/system/screen_security/screen_share_tray_item.cc

@@ -2,15 +2,15 @@

// 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/screen_security/screen_share_tray_item.h"

+#include "ash/system/screen_security/screen_share_tray_item.h"

#include <utility>

-#include "ash/common/system/system_notifier.h"

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

#include "ash/common/wm_shell.h"

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

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

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

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

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

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

#include "ui/message_center/message_center.h"