ash/shell.cc - Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces 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/shell.cc

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel

Patch Set: Created 4 years, 6 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/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index 29e522d013dd22170173f2cc605856355975e286..98974c562ab5f31e231ff2e51a089be9c9cd5433 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -15,6 +15,10 @@

#include "ash/aura/wm_shell_aura.h"

#include "ash/aura/wm_window_aura.h"

#include "ash/autoclick/autoclick_controller.h"

+#include "ash/common/gpu_support.h"

+#include "ash/common/media_delegate.h"

+#include "ash/common/pointer_watcher_delegate.h"

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

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

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

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

@@ -36,7 +40,6 @@

#include "ash/first_run/first_run_helper_impl.h"

#include "ash/focus_cycler.h"

#include "ash/frame/custom_frame_view_ash.h"

-#include "ash/gpu_support.h"

#include "ash/high_contrast/high_contrast_controller.h"

#include "ash/host/ash_window_tree_host_init_params.h"

#include "ash/ime/input_method_event_handler.h"

@@ -44,11 +47,8 @@

#include "ash/keyboard_uma_event_filter.h"

#include "ash/magnifier/magnification_controller.h"

#include "ash/magnifier/partial_magnification_controller.h"

-#include "ash/media_delegate.h"

#include "ash/new_window_delegate.h"

-#include "ash/pointer_watcher_delegate.h"

#include "ash/root_window_controller.h"

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

#include "ash/shelf/app_list_shelf_item_delegate.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_delegate.h"

« ash/common/session/session_state_delegate.h ('K') | « ash/shelf/shelf_widget.cc ('k') | ash/shell/app_list.cc » ('j') | no next file with comments »