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

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

Issue 2200893002: mash: Partially migrate ash/desktop_background to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mash browser test crash in GetMaxDisplaySizeInNative. Created 4 years, 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/aura/wm_window_aura.h" 5 #include "ash/aura/wm_window_aura.h"
6 #include "ash/common/wm/root_window_finder.h" 6 #include "ash/common/wm/root_window_finder.h"
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_factory.h"
9 #include "ash/wm/window_properties.h" 8 #include "ash/wm/window_properties.h"
10 #include "ui/aura/client/capture_client.h" 9 #include "ui/aura/client/capture_client.h"
11 #include "ui/aura/client/screen_position_client.h" 10 #include "ui/aura/client/screen_position_client.h"
12 #include "ui/aura/env.h" 11 #include "ui/aura/env.h"
13 #include "ui/aura/test/ui_controls_factory_aura.h" 12 #include "ui/aura/test/ui_controls_factory_aura.h"
14 #include "ui/aura/window_property.h" 13 #include "ui/aura/window_property.h"
15 #include "ui/aura/window_tree_host.h" 14 #include "ui/aura/window_tree_host.h"
16 #include "ui/base/test/ui_controls.h" 15 #include "ui/base/test/ui_controls.h"
17 #include "ui/base/test/ui_controls_aura.h" 16 #include "ui/base/test/ui_controls_aura.h"
18 #include "ui/display/screen.h" 17 #include "ui/display/screen.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 private: 128 private:
130 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh); 129 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
131 }; 130 };
132 131
133 ui_controls::UIControlsAura* CreateAshUIControls() { 132 ui_controls::UIControlsAura* CreateAshUIControls() {
134 return new ash::test::UIControlsAsh(); 133 return new ash::test::UIControlsAsh();
135 } 134 }
136 135
137 } // namespace test 136 } // namespace test
138 } // namespace ash 137 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sysui/sysui_application.cc ('k') | chrome/browser/chromeos/extensions/wallpaper_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698