chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc - Issue 2731873002: Revert "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: chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc

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

Patch Set: 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

« no previous file with comments | « chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc ('k') | chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc

index 04546506f8d1f4f3bc6e79b425de4117bea96033..b356b01c26a25e273e003c953f85a9c32a67fed5 100644

--- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc

@@ -7,8 +7,8 @@

#include <stdint.h>

#include <utility>

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

#include "ash/common/wm_shell.h"

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

#include "base/bind.h"

#include "base/macros.h"

#include "base/strings/string_number_conversions.h"