ash/accelerators/accelerator_controller.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

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/accelerators/accelerator_controller.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: rebase Created 4 years, 5 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/accelerators/accelerator_controller.cc

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc

index dbc9d21e995889a843b1423f6068649bd1819450..13b422265bcd4394c76d0a9f2d84f749c80fccda 100644

--- a/ash/accelerators/accelerator_controller.cc

+++ b/ash/accelerators/accelerator_controller.cc

@@ -23,7 +23,9 @@

#include "ash/common/shell_window_ids.h"

#include "ash/common/system/brightness_control_delegate.h"

#include "ash/common/system/keyboard_brightness_control_delegate.h"

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

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

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

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

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

#include "ash/common/system/volume_control_delegate.h"

@@ -50,8 +52,6 @@

#include "ash/shelf/shelf_delegate.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

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

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

#include "ash/touch/touch_hud_debug.h"

#include "ash/utility/screenshot_controller.h"

#include "ash/wm/power_button_controller.h"

« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | no next file with comments »