ash/mus/top_level_window_factory.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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/mus/top_level_window_factory.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (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 unified diff | Download patch

« no previous file with comments | « ash/mus/test/wm_test_helper.cc ('k') | ash/mus/top_level_window_factory_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2017 The Chromium Authors. All rights reserved.	1 // Copyright 2017 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/mus/top_level_window_factory.h"	5 #include "ash/mus/top_level_window_factory.h"

6	6

	7 #include "ash/common/wm_shell.h"

	8 #include "ash/common/wm_window.h"

7 #include "ash/mus/disconnected_app_handler.h"	9 #include "ash/mus/disconnected_app_handler.h"

8 #include "ash/mus/frame/detached_title_area_renderer.h"	10 #include "ash/mus/frame/detached_title_area_renderer.h"

9 #include "ash/mus/non_client_frame_controller.h"	11 #include "ash/mus/non_client_frame_controller.h"

10 #include "ash/mus/property_util.h"	12 #include "ash/mus/property_util.h"

11 #include "ash/mus/window_manager.h"	13 #include "ash/mus/window_manager.h"

12 #include "ash/public/cpp/shell_window_ids.h"	14 #include "ash/public/cpp/shell_window_ids.h"

13 #include "ash/root_window_controller.h"	15 #include "ash/root_window_controller.h"

14 #include "ash/root_window_settings.h"	16 #include "ash/root_window_settings.h"

15 #include "ash/wm/container_finder.h"	17 #include "ash/wm/container_finder.h"

16 #include "ash/wm/window_state.h"	18 #include "ash/wm/window_state.h"

17 #include "ash/wm_shell.h"

18 #include "ash/wm_window.h"

19 #include "mojo/public/cpp/bindings/type_converter.h"	19 #include "mojo/public/cpp/bindings/type_converter.h"

20 #include "services/ui/public/cpp/property_type_converters.h"	20 #include "services/ui/public/cpp/property_type_converters.h"

21 #include "services/ui/public/interfaces/window_manager.mojom.h"	21 #include "services/ui/public/interfaces/window_manager.mojom.h"

22 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"	22 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"

23 #include "ui/aura/client/aura_constants.h"	23 #include "ui/aura/client/aura_constants.h"

24 #include "ui/aura/mus/property_converter.h"	24 #include "ui/aura/mus/property_converter.h"

25 #include "ui/aura/mus/property_utils.h"	25 #include "ui/aura/mus/property_utils.h"

26 #include "ui/aura/mus/window_tree_client.h"	26 #include "ui/aura/mus/window_tree_client.h"

27 #include "ui/aura/window.h"	27 #include "ui/aura/window.h"

28 #include "ui/display/display.h"	28 #include "ui/display/display.h"

(...skipping 199 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
228 if (non_client_frame_controller)	228 if (non_client_frame_controller)

229 non_client_frame_controller->set_can_activate(can_focus);	229 non_client_frame_controller->set_can_activate(can_focus);

230 // No need to persist this value.	230 // No need to persist this value.

231 properties->erase(focusable_iter);	231 properties->erase(focusable_iter);

232 }	232 }

233 return window;	233 return window;

234 }	234 }

235	235

236 } // namespace mus	236 } // namespace mus

237 } // namespace ash	237 } // namespace ash

OLD	NEW