chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2889413002: chromeos: nukes window_state_aura

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: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

Issue 2889413002: chromeos: nukes window_state_aura (Closed)

Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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 | « chrome/browser/ui/ash/accelerator_controller_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"	4 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"

5	5

6 #include <string>	6 #include <string>

7	7

8 #include "ash/display/screen_orientation_controller_chromeos.h"	8 #include "ash/display/screen_orientation_controller_chromeos.h"

9 #include "ash/public/cpp/window_properties.h"	9 #include "ash/public/cpp/window_properties.h"

10 #include "ash/shared/app_types.h"	10 #include "ash/shared/app_types.h"

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

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

13 #include "ash/wm/maximize_mode/maximize_mode_controller.h"	13 #include "ash/wm/maximize_mode/maximize_mode_controller.h"

14 #include "ash/wm/window_state.h"	14 #include "ash/wm/window_state.h"

15 #include "ash/wm/window_state_aura.h"

16 #include "ash/wm/window_util.h"	15 #include "ash/wm/window_util.h"

17 #include "ash/wm_window.h"	16 #include "ash/wm_window.h"

18 #include "base/bind.h"	17 #include "base/bind.h"

19 #include "base/memory/ptr_util.h"	18 #include "base/memory/ptr_util.h"

20 #include "chrome/browser/chromeos/arc/arc_util.h"	19 #include "chrome/browser/chromeos/arc/arc_util.h"

21 #include "chrome/browser/profiles/profile.h"	20 #include "chrome/browser/profiles/profile.h"

22 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"	21 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"

23 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller .h"	22 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller .h"

24 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"	23 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

25 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"	24 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"

(...skipping 689 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
715 const std::string arc_app_id = exo::ShellSurface::GetApplicationId(window);	714 const std::string arc_app_id = exo::ShellSurface::GetApplicationId(window);

716 if (arc_app_id.empty())	715 if (arc_app_id.empty())

717 return -1;	716 return -1;

718	717

719 int task_id = -1;	718 int task_id = -1;

720 if (sscanf(arc_app_id.c_str(), "org.chromium.arc.%d", &task_id) != 1)	719 if (sscanf(arc_app_id.c_str(), "org.chromium.arc.%d", &task_id) != 1)

721 return -1;	720 return -1;

722	721

723 return task_id;	722 return task_id;

724 }	723 }

OLD	NEW