chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.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_unittest.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/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.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_unittest.cc

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

index e6248b891604c9d836c39074cd58854ae73b730b..ce78588f48a8abd7040bb081ad86a89350c61210 100644

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

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

@@ -32,7 +32,6 @@

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/browser_tabstrip.h"

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

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

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/pref_names.h"

@@ -45,6 +44,7 @@

#include "testing/gtest/include/gtest/gtest.h"

#include "ui/aura/client/window_tree_client.h"

#include "ui/base/models/menu_model.h"

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

#if defined(OS_CHROMEOS)

#include "ash/test/test_session_state_delegate.h"