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

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

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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) 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_util.h" 5 #include "chrome/browser/ui/ash/ash_util.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "chrome/browser/ui/ash/ash_init.h" 8 #include "chrome/browser/ui/ash/ash_init.h"
9 #include "chrome/browser/ui/host_desktop.h" 9 #include "chrome/browser/ui/host_desktop.h"
10 #include "ui/aura/window_event_dispatcher.h" 10 #include "ui/aura/window_event_dispatcher.h"
11 11
12 #if !defined(OS_CHROMEOS) 12 #if !defined(OS_CHROMEOS)
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #endif 15 #endif
16 16
17 namespace chrome { 17 namespace chrome {
18 18
19 bool ShouldOpenAshOnStartup() { 19 bool ShouldOpenAshOnStartup() {
20 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
21 return true; 21 return true;
22 #else 22 #else
23 // TODO(scottmg): http://crbug.com/133312, will need this for Win8 too. 23 // TODO(scottmg): http://crbug.com/133312, will need this for Win8 too.
24 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh); 24 return base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh);
25 #endif 25 #endif
26 } 26 }
27 27
28 bool IsNativeViewInAsh(gfx::NativeView native_view) { 28 bool IsNativeViewInAsh(gfx::NativeView native_view) {
29 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
30 // Optimization. There is only ash or only athena on ChromeOS. 30 // Optimization. There is only ash or only athena on ChromeOS.
31 return ash::Shell::HasInstance(); 31 return ash::Shell::HasInstance();
32 #endif 32 #endif
33 33
34 if (!ash::Shell::HasInstance()) 34 if (!ash::Shell::HasInstance())
35 return false; 35 return false;
36 36
37 aura::Window::Windows root_windows = 37 aura::Window::Windows root_windows =
38 ash::Shell::GetInstance()->GetAllRootWindows(); 38 ash::Shell::GetInstance()->GetAllRootWindows();
39 39
40 for (aura::Window::Windows::const_iterator it = root_windows.begin(); 40 for (aura::Window::Windows::const_iterator it = root_windows.begin();
41 it != root_windows.end(); ++it) { 41 it != root_windows.end(); ++it) {
42 if ((*it)->Contains(native_view)) 42 if ((*it)->Contains(native_view))
43 return true; 43 return true;
44 } 44 }
45 45
46 return false; 46 return false;
47 } 47 }
48 48
49 bool IsNativeWindowInAsh(gfx::NativeWindow native_window) { 49 bool IsNativeWindowInAsh(gfx::NativeWindow native_window) {
50 return IsNativeViewInAsh(native_window); 50 return IsNativeViewInAsh(native_window);
51 } 51 }
52 52
53 } // namespace chrome 53 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698