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

Side by Side Diff: ash/test/ash_test_base.cc

Issue 2217713002: Remove the system menu display settings row (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 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
« no previous file with comments | « ash/system/chromeos/tray_display_unittest.cc ('k') | ash/test/test_system_tray_delegate.h » ('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 (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 "ash/test/ash_test_base.h" 5 #include "ash/test/ash_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/ash_switches.h" 10 #include "ash/common/ash_switches.h"
(...skipping 19 matching lines...) Expand all
30 #include "ui/aura/window.h" 30 #include "ui/aura/window.h"
31 #include "ui/aura/window_delegate.h" 31 #include "ui/aura/window_delegate.h"
32 #include "ui/aura/window_tree_host.h" 32 #include "ui/aura/window_tree_host.h"
33 #include "ui/base/ime/input_method_initializer.h" 33 #include "ui/base/ime/input_method_initializer.h"
34 #include "ui/display/display.h" 34 #include "ui/display/display.h"
35 #include "ui/display/screen.h" 35 #include "ui/display/screen.h"
36 #include "ui/events/gesture_detection/gesture_configuration.h" 36 #include "ui/events/gesture_detection/gesture_configuration.h"
37 #include "ui/gfx/geometry/point.h" 37 #include "ui/gfx/geometry/point.h"
38 #include "ui/wm/core/coordinate_conversion.h" 38 #include "ui/wm/core/coordinate_conversion.h"
39 39
40 #if defined(OS_CHROMEOS)
41 #include "ash/system/chromeos/tray_display.h"
42 #endif
43
44 #if defined(OS_WIN) 40 #if defined(OS_WIN)
45 #include "base/win/windows_version.h" 41 #include "base/win/windows_version.h"
46 #include "ui/platform_window/win/win_window.h" 42 #include "ui/platform_window/win/win_window.h"
47 #endif 43 #endif
48 44
49 #if defined(USE_X11) 45 #if defined(USE_X11)
50 #include "ui/gfx/x/x11_connection.h" // nogncheck 46 #include "ui/gfx/x/x11_connection.h" // nogncheck
51 #endif 47 #endif
52 48
53 namespace ash { 49 namespace ash {
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 374
379 void AshTestBase::DisableIME() { 375 void AshTestBase::DisableIME() {
380 Shell::GetInstance()->RemovePreTargetHandler( 376 Shell::GetInstance()->RemovePreTargetHandler(
381 Shell::GetInstance() 377 Shell::GetInstance()
382 ->window_tree_host_manager() 378 ->window_tree_host_manager()
383 ->input_method_event_handler()); 379 ->input_method_event_handler());
384 } 380 }
385 381
386 } // namespace test 382 } // namespace test
387 } // namespace ash 383 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/tray_display_unittest.cc ('k') | ash/test/test_system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698