chrome/browser/ui/views/frame/system_menu_model_builder.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/views/frame/system_menu_model_builder.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/views/frame/native_browser_frame_factory.h ('k') | chrome/browser/ui/views/frame/taskbar_decorator_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc

diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.cc b/chrome/browser/ui/views/frame/system_menu_model_builder.cc

index 60f1bf930f03433d315a48437f456891a7f388d1..3cdd9dcf2ed943a05f98a0580d6a84bd84e89a20 100644

--- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc

+++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc

@@ -8,7 +8,6 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

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

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

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

#include "chrome/browser/ui/toolbar/wrench_menu_model.h"

#include "chrome/common/chrome_switches.h"

@@ -16,6 +15,7 @@

#include "chrome/grit/generated_resources.h"

#include "ui/base/accelerators/accelerator.h"

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

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

#if defined(OS_CHROMEOS)

#include "ash/session/session_state_delegate.h"