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

Side by Side Diff: ash/system/palette/palette_utils.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « ash/system/palette/palette_tray.cc ('k') | ash/system/palette/tools/capture_region_mode.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/system/palette/palette_utils.h" 5 #include "ash/system/palette/palette_utils.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/common/ash_switches.h"
8 #include "ash/common/wm_shell.h"
9 #include "ash/common/wm_window.h"
8 #include "ash/shelf/wm_shelf.h" 10 #include "ash/shelf/wm_shelf.h"
9 #include "ash/system/palette/palette_tray.h" 11 #include "ash/system/palette/palette_tray.h"
10 #include "ash/system/status_area_widget.h" 12 #include "ash/system/status_area_widget.h"
11 #include "ash/wm_shell.h"
12 #include "ash/wm_window.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "ui/events/devices/input_device_manager.h" 14 #include "ui/events/devices/input_device_manager.h"
15 #include "ui/events/devices/touchscreen_device.h" 15 #include "ui/events/devices/touchscreen_device.h"
16 #include "ui/gfx/geometry/point.h" 16 #include "ui/gfx/geometry/point.h"
17 17
18 namespace ash { 18 namespace ash {
19 namespace palette_utils { 19 namespace palette_utils {
20 20
21 bool HasStylusInput() { 21 bool HasStylusInput() {
22 // Allow the user to force-enable by passing a switch. 22 // Allow the user to force-enable by passing a switch.
(...skipping 24 matching lines...) Expand all
47 WmShelf::ForWindow(window)->GetStatusAreaWidget()->palette_tray(); 47 WmShelf::ForWindow(window)->GetStatusAreaWidget()->palette_tray();
48 if (palette_tray && palette_tray->ContainsPointInScreen(point)) 48 if (palette_tray && palette_tray->ContainsPointInScreen(point))
49 return true; 49 return true;
50 } 50 }
51 51
52 return false; 52 return false;
53 } 53 }
54 54
55 } // namespace palette_utils 55 } // namespace palette_utils
56 } // namespace ash 56 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/palette/palette_tray.cc ('k') | ash/system/palette/tools/capture_region_mode.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698