Chromium Code Reviews| Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
| diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
| index b8b7d2f3dcac7ed62fa71028f696ac8f7d4d5fac..22b1f57aae2bd3ad2f59c5b396ea251d1e15bd31 100644 |
| --- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
| +++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
| @@ -28,6 +28,7 @@ |
| namespace { |
| +#if !defined(OS_CHROMEOS) && defined(USE_ASH) |
| // Returns the desktop this process was initially launched in. |
| chrome::HostDesktopType GetInitialDesktop() { |
| #if defined(OS_WIN) && defined(USE_ASH) |
| @@ -39,6 +40,7 @@ chrome::HostDesktopType GetInitialDesktop() { |
| #endif |
| return chrome::HOST_DESKTOP_TYPE_NATIVE; |
| } |
| +#endif |
|
Nico
2013/11/10 05:07:09
// !defined(OS_CHROMEOS) && defined(USE_ASH)
hans
2013/11/11 19:29:51
Done.
|
| } // namespace |