Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(375)

Side by Side Diff: chrome/browser/platform_util_win.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/platform_util.h" 5 #include "chrome/browser/platform_util.h"
6 6
7 #include <commdlg.h> 7 #include <commdlg.h>
8 #include <dwmapi.h> 8 #include <dwmapi.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #include <shlobj.h> 10 #include <shlobj.h>
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/lifetime/application_lifetime.h" 24 #include "chrome/browser/lifetime/application_lifetime.h"
25 #include "chrome/browser/platform_util_internal.h" 25 #include "chrome/browser/platform_util_internal.h"
26 #include "chrome/browser/ui/host_desktop.h" 26 #include "chrome/browser/ui/host_desktop.h"
27 #include "chrome/common/chrome_utility_messages.h" 27 #include "chrome/common/chrome_utility_messages.h"
28 #include "chrome/grit/generated_resources.h" 28 #include "chrome/grit/generated_resources.h"
29 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/utility_process_host.h" 30 #include "content/public/browser/utility_process_host.h"
31 #include "content/public/browser/utility_process_host_client.h" 31 #include "content/public/browser/utility_process_host_client.h"
32 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/win/shell.h" 33 #include "ui/base/win/shell.h"
34 #include "ui/gfx/host_desktop_type.h"
34 #include "ui/gfx/native_widget_types.h" 35 #include "ui/gfx/native_widget_types.h"
35 #include "url/gurl.h" 36 #include "url/gurl.h"
36 37
37 using content::BrowserThread; 38 using content::BrowserThread;
38 39
39 namespace platform_util { 40 namespace platform_util {
40 41
41 namespace { 42 namespace {
42 43
43 // TODO(asanka): Move this to ui/base/win/shell.{h,cc} and invoke it from the 44 // TODO(asanka): Move this to ui/base/win/shell.{h,cc} and invoke it from the
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 232
232 if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH && 233 if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH &&
233 !url.SchemeIsHTTPOrHTTPS()) 234 !url.SchemeIsHTTPOrHTTPS())
234 chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING); 235 chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING);
235 236
236 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 237 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
237 base::Bind(&OpenExternalOnFileThread, url)); 238 base::Bind(&OpenExternalOnFileThread, url));
238 } 239 }
239 240
240 } // namespace platform_util 241 } // namespace platform_util
OLDNEW
« no previous file with comments | « chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc ('k') | chrome/browser/plugins/plugin_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698