ash/shell/content_client/shell_browser_main_parts.cc - Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens

Patch Set: Fix gn build Created 6 years, 1 month 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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/shell/content_client/shell_browser_main_parts.h"	5 #include "ash/shell/content_client/shell_browser_main_parts.h"

6	6

7 #include "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

8 #include "ash/desktop_background/desktop_background_controller.h"	8 #include "ash/desktop_background/desktop_background_controller.h"

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "ash/shell/shell_delegate_impl.h"	10 #include "ash/shell/shell_delegate_impl.h"

(...skipping 16 matching lines...) Expand all Loading...
27 #include "ui/aura/window.h"	27 #include "ui/aura/window.h"

28 #include "ui/aura/window_tree_host.h"	28 #include "ui/aura/window_tree_host.h"

29 #include "ui/base/ui_base_paths.h"	29 #include "ui/base/ui_base_paths.h"

30 #include "ui/compositor/compositor.h"	30 #include "ui/compositor/compositor.h"

31 #include "ui/gfx/screen.h"	31 #include "ui/gfx/screen.h"

32 #include "ui/message_center/message_center.h"	32 #include "ui/message_center/message_center.h"

33 #include "ui/views/test/test_views_delegate.h"	33 #include "ui/views/test/test_views_delegate.h"

34 #include "ui/wm/core/wm_state.h"	34 #include "ui/wm/core/wm_state.h"

35	35

36 #if defined(USE_X11)	36 #if defined(USE_X11)

37 #include "ui/events/x/touch_factory_x11.h"	37 #include "ui/events/devices/x11/touch_factory_x11.h"

38 #endif	38 #endif

39	39

40 #if defined(OS_CHROMEOS)	40 #if defined(OS_CHROMEOS)

41 #include "chromeos/audio/cras_audio_handler.h"	41 #include "chromeos/audio/cras_audio_handler.h"

42 #include "chromeos/dbus/dbus_thread_manager.h"	42 #include "chromeos/dbus/dbus_thread_manager.h"

43 #endif	43 #endif

44	44

45 namespace ash {	45 namespace ash {

46 namespace shell {	46 namespace shell {

47 void InitWindowTypeLauncher();	47 void InitWindowTypeLauncher();

(...skipping 118 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
166 browser_context_.reset();	166 browser_context_.reset();

167 }	167 }

168	168

169 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {	169 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {

170 base::MessageLoopForUI::current()->Run();	170 base::MessageLoopForUI::current()->Run();

171 return true;	171 return true;

172 }	172 }

173	173

174 } // namespace shell	174 } // namespace shell

175 } // namespace ash	175 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/host/ash_window_tree_host_x11.cc ('k') | ash/touch/touch_hud_debug.cc » ('j') | ui/events/devices/BUILD.gn » ('J')