chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.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: chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.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 | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc ('k') | chrome/browser/ui/ash/launcher/extension_launcher_context_menu.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	4

5 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controlle r.h"	5 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controlle r.h"

6	6

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

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

7 #include "ash/shelf/shelf_delegate.h"	9 #include "ash/shelf/shelf_delegate.h"

8 #include "ash/wm/window_properties.h"	10 #include "ash/wm/window_properties.h"

9 #include "ash/wm/window_util.h"	11 #include "ash/wm/window_util.h"

10 #include "ash/wm_shell.h"

11 #include "ash/wm_window.h"

12 #include "base/stl_util.h"	12 #include "base/stl_util.h"

13 #include "base/strings/stringprintf.h"	13 #include "base/strings/stringprintf.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

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

16 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_cont roller.h"	16 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_cont roller.h"

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

18 #include "extensions/browser/app_window/app_window.h"	18 #include "extensions/browser/app_window/app_window.h"

19 #include "extensions/browser/app_window/native_app_window.h"	19 #include "extensions/browser/app_window/native_app_window.h"

20 #include "extensions/common/extension.h"	20 #include "extensions/common/extension.h"

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

(...skipping 212 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
234 WindowToAppShelfIdMap::iterator window_iter =	234 WindowToAppShelfIdMap::iterator window_iter =

235 window_to_app_shelf_id_map_.find(window);	235 window_to_app_shelf_id_map_.find(window);

236 if (window_iter == window_to_app_shelf_id_map_.end())	236 if (window_iter == window_to_app_shelf_id_map_.end())

237 return nullptr;	237 return nullptr;

238 AppControllerMap::iterator app_controller_iter =	238 AppControllerMap::iterator app_controller_iter =

239 app_controller_map_.find(window_iter->second);	239 app_controller_map_.find(window_iter->second);

240 if (app_controller_iter == app_controller_map_.end())	240 if (app_controller_iter == app_controller_map_.end())

241 return nullptr;	241 return nullptr;

242 return app_controller_iter->second;	242 return app_controller_iter->second;

243 }	243 }

OLD	NEW