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

Side by Side Diff: ash/shell_unittest.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 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
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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/common/ash_switches.h"
11 #include "ash/common/session/session_state_delegate.h" 11 #include "ash/common/session/session_state_delegate.h"
12 #include "ash/common/shell_window_ids.h" 12 #include "ash/common/shell_window_ids.h"
13 #include "ash/desktop_background/desktop_background_widget_controller.h" 13 #include "ash/desktop_background/desktop_background_widget_controller.h"
14 #include "ash/display/mouse_cursor_event_filter.h" 14 #include "ash/display/mouse_cursor_event_filter.h"
15 #include "ash/drag_drop/drag_drop_controller.h" 15 #include "ash/drag_drop/drag_drop_controller.h"
16 #include "ash/root_window_controller.h" 16 #include "ash/root_window_controller.h"
17 #include "ash/shelf/shelf.h" 17 #include "ash/shelf/shelf.h"
18 #include "ash/shelf/shelf_layout_manager.h" 18 #include "ash/shelf/shelf_layout_manager.h"
19 #include "ash/shelf/shelf_widget.h" 19 #include "ash/shelf/shelf_widget.h"
20 #include "ash/shell_delegate.h" 20 #include "ash/shell_delegate.h"
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 private: 516 private:
517 DISALLOW_COPY_AND_ASSIGN(ShellTest2); 517 DISALLOW_COPY_AND_ASSIGN(ShellTest2);
518 }; 518 };
519 519
520 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) { 520 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
521 window_.reset(new aura::Window(NULL)); 521 window_.reset(new aura::Window(NULL));
522 window_->Init(ui::LAYER_NOT_DRAWN); 522 window_->Init(ui::LAYER_NOT_DRAWN);
523 } 523 }
524 524
525 } // namespace ash 525 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/content/client/shell_browser_main_parts.cc ('k') | ash/system/chromeos/network/network_state_list_detailed_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698