ash/system/tray/system_tray_unittest.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/system_tray_unittest.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/tray/system_tray_unittest.cc

diff --git a/ash/common/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc

similarity index 98%

rename from ash/common/system/tray/system_tray_unittest.cc

rename to ash/system/tray/system_tray_unittest.cc

index 4b3123cfebfcbe35fbfbb32e08bd6cbb881be0d1..766252479a8dbc71dfbba1bff4ba8f1d2af00b55 100644

--- a/ash/common/system/tray/system_tray_unittest.cc

+++ b/ash/system/tray/system_tray_unittest.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/tray/system_tray.h"

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

#include <string>

#include <vector>

@@ -10,16 +10,16 @@

#include "ash/common/accelerators/accelerator_controller.h"

#include "ash/common/accessibility_delegate.h"

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

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

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

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

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

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

-#include "ash/common/system/web_notification/web_notification_tray.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

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

#include "ash/root_window_controller.h"

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

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

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

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

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

+#include "ash/system/web_notification/web_notification_tray.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/status_area_widget_test_helper.h"

#include "ash/test/test_system_tray_item.h"

« no previous file with comments | « ash/system/tray/system_tray_notifier.cc ('k') | ash/system/tray/throbber_view.h » ('j') | no next file with comments »