chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc - Issue 1921353002: Moves handful of files to ash/wm/common

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_item_controller.cc

Issue 1921353002: Moves handful of files to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell_ids

Patch Set: merge to trunk Created 4 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/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.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_item_cont roller.h"	5 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_cont roller.h"

6	6

7 #include "ash/wm/window_state.h"	7 #include "ash/wm/common/window_state.h"

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

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

10 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"	10 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"

11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"	11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"

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

13 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"	13 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"

14 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"	14 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"

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

16 #include "components/favicon/content/content_favicon_driver.h"	16 #include "components/favicon/content/content_favicon_driver.h"

17 #include "content/public/browser/web_contents.h"	17 #include "content/public/browser/web_contents.h"

(...skipping 140 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158 if (type() == TYPE_APP_PANEL)	158 if (type() == TYPE_APP_PANEL)

159 return true;	159 return true;

160 return AppWindowLauncherItemController::IsDraggable();	160 return AppWindowLauncherItemController::IsDraggable();

161 }	161 }

162	162

163 bool ExtensionAppWindowLauncherItemController::ShouldShowTooltip() {	163 bool ExtensionAppWindowLauncherItemController::ShouldShowTooltip() {

164 if (type() == TYPE_APP_PANEL && IsVisible())	164 if (type() == TYPE_APP_PANEL && IsVisible())

165 return false;	165 return false;

166 return AppWindowLauncherItemController::ShouldShowTooltip();	166 return AppWindowLauncherItemController::ShouldShowTooltip();

167 }	167 }

OLD	NEW