ash/system/cast/tray_cast.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/cast/tray_cast.cc

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

Patch Set: rebase Created 3 years, 9 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/cast/tray_cast.cc

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

similarity index 96%

rename from ash/common/system/chromeos/cast/tray_cast.cc

rename to ash/system/cast/tray_cast.cc

index 4ad2fd9fa44864f672eb98f0d7b6841bad0abd76..45e54f4ab16f4779929586dc3dc8585958d4f3c0 100644

--- a/ash/common/system/chromeos/cast/tray_cast.cc

+++ b/ash/system/cast/tray_cast.cc

@@ -2,7 +2,7 @@

// 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/cast/tray_cast.h"

+#include "ash/system/cast/tray_cast.h"

#include <map>

#include <string>

@@ -13,23 +13,23 @@

#include "ash/common/material_design/material_design_controller.h"

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

#include "ash/common/shelf/wm_shelf_util.h"

-#include "ash/common/system/chromeos/screen_security/screen_tray_item.h"

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

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

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

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

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

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

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

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

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

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

#include "ash/common/wm_shell.h"

#include "ash/public/cpp/shelf_types.h"

#include "ash/public/interfaces/cast_config.mojom.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#include "base/bind.h"

#include "base/strings/utf_string_conversions.h"

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

« no previous file with comments | « ash/system/cast/tray_cast.h ('k') | ash/system/chromeos/DEPS » ('j') | no next file with comments »