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

Side by Side Diff: chrome/browser/ui/ash/ash_init.cc

Issue 348513002: On Windows ASH ensure that we get the display created for the root window serving ASH. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/ash/ash_init.h" 5 #include "chrome/browser/ui/ash/ash_init.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/accelerometer/accelerometer_controller.h" 8 #include "ash/accelerometer/accelerometer_controller.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/high_contrast/high_contrast_controller.h" 10 #include "ash/high_contrast/high_contrast_controller.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 } 98 }
99 #endif 99 #endif
100 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); 100 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
101 } 101 }
102 102
103 void CloseAsh() { 103 void CloseAsh() {
104 if (ash::Shell::HasInstance()) 104 if (ash::Shell::HasInstance())
105 ash::Shell::DeleteInstance(); 105 ash::Shell::DeleteInstance();
106 } 106 }
107 107
108 #if defined(OS_WIN)
109 bool IsAshProcess() {
110 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kViewerConnect);
111 }
112 #endif
113
108 } // namespace chrome 114 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698