chrome/browser/ui/ash/launcher/extension_launcher_context_menu.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_launcher_context_menu.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/extension_app_window_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/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_launcher_context_menu.h"	5 #include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"

6	6

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

7 #include "ash/shelf/shelf_item_delegate.h"	8 #include "ash/shelf/shelf_item_delegate.h"

8 #include "ash/wm_shell.h"

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "chrome/browser/extensions/context_menu_matcher.h"	10 #include "chrome/browser/extensions/context_menu_matcher.h"

11 #include "chrome/browser/extensions/extension_util.h"	11 #include "chrome/browser/extensions/extension_util.h"

12 #include "chrome/browser/extensions/launch_util.h"	12 #include "chrome/browser/extensions/launch_util.h"

13 #include "chrome/browser/prefs/incognito_mode_prefs.h"	13 #include "chrome/browser/prefs/incognito_mode_prefs.h"

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

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

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

17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"	17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"

18 #include "chrome/browser/ui/browser_commands.h"	18 #include "chrome/browser/ui/browser_commands.h"

(...skipping 202 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
221 if (!extension)	221 if (!extension)

222 return extensions::LAUNCH_TYPE_DEFAULT;	222 return extensions::LAUNCH_TYPE_DEFAULT;

223	223

224 return extensions::GetLaunchType(	224 return extensions::GetLaunchType(

225 extensions::ExtensionPrefs::Get(controller()->profile()), extension);	225 extensions::ExtensionPrefs::Get(controller()->profile()), extension);

226 }	226 }

227	227

228 void ExtensionLauncherContextMenu::SetLaunchType(extensions::LaunchType type) {	228 void ExtensionLauncherContextMenu::SetLaunchType(extensions::LaunchType type) {

229 extensions::SetLaunchType(controller()->profile(), item().app_id, type);	229 extensions::SetLaunchType(controller()->profile(), item().app_id, type);

230 }	230 }

OLD	NEW