chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc - Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h

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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type

Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

index 9eac2dc529fa3810143694f2736aacbb86262c29..de3f0c32f74ccaa3078b5ac106d4c833fc35a51b 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

@@ -59,7 +59,6 @@

#include "chrome/browser/ui/extensions/app_launch_params.h"

#include "chrome/browser/ui/extensions/application_launch.h"

#include "chrome/browser/ui/extensions/extension_enable_flow.h"

-#include "chrome/browser/ui/host_desktop.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/browser/web_applications/web_app.h"

#include "chrome/common/chrome_switches.h"

@@ -86,6 +85,7 @@

#include "ui/aura/window_event_dispatcher.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/window_open_disposition.h"

+#include "ui/gfx/host_desktop_type.h"

#include "ui/keyboard/keyboard_util.h"

#include "ui/resources/grit/ui_resources.h"

#include "ui/wm/core/window_animations.h"