ash/common/system/chromeos/audio/tray_audio.cc - Issue 2620153003: Folds WmRootWindowController into RootWindowController

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/common/system/chromeos/audio/tray_audio.cc

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)

Patch Set: merge Created 3 years, 11 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/common/system/chromeos/audio/tray_audio.cc

diff --git a/ash/common/system/chromeos/audio/tray_audio.cc b/ash/common/system/chromeos/audio/tray_audio.cc

index a203026ed54fa43a0fe1ab24fba1c2ad99525753..7260102e9b47bb5e55fb92a00c4e9514181280d7 100644

--- a/ash/common/system/chromeos/audio/tray_audio.cc

+++ b/ash/common/system/chromeos/audio/tray_audio.cc

@@ -9,9 +9,9 @@

#include "ash/common/system/chromeos/audio/volume_view.h"

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

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

-#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

+#include "ash/root_window_controller.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "grit/ash_resources.h"

#include "ui/display/display.h"

« no previous file with comments | « ash/common/shelf/wm_shelf.cc ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »