ash/shelf/shelf_layout_manager_unittest.cc - Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/.

Side by Side Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « ash/session_state_delegate_stub.cc ('k') | ash/shell/app_list.cc » ('j') | no next file with comments »

OLD	NEW
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/shelf/shelf_layout_manager.h"	5 #include "ash/shelf/shelf_layout_manager.h"

6	6

7 #include "ash/accelerators/accelerator_controller.h"	7 #include "ash/accelerators/accelerator_controller.h"

8 #include "ash/accelerators/accelerator_table.h"	8 #include "ash/accelerators/accelerator_table.h"

9 #include "ash/ash_switches.h"	9 #include "ash/ash_switches.h"

10 #include "ash/display/display_manager.h"	10 #include "ash/display/display_manager.h"

11 #include "ash/focus_cycler.h"	11 #include "ash/focus_cycler.h"

12 #include "ash/launcher/launcher.h"	12 #include "ash/launcher/launcher.h"

13 #include "ash/launcher/launcher_view.h"	13 #include "ash/launcher/launcher_view.h"

14 #include "ash/root_window_controller.h"	14 #include "ash/root_window_controller.h"

15 #include "ash/screen_ash.h"	15 #include "ash/screen_ash.h"

16 #include "ash/session_state_delegate.h"	16 #include "ash/session_state_delegate.h"

17 #include "ash/shelf/shelf_layout_manager_observer.h"	17 #include "ash/shelf/shelf_layout_manager_observer.h"

18 #include "ash/shelf/shelf_widget.h"	18 #include "ash/shelf/shelf_widget.h"

19 #include "ash/shell.h"	19 #include "ash/shell.h"

20 #include "ash/shell_window_ids.h"	20 #include "ash/shell_window_ids.h"

21 #include "ash/system/status_area_widget.h"	21 #include "ash/system/status_area_widget.h"

22 #include "ash/system/tray/system_tray.h"	22 #include "ash/system/tray/system_tray.h"

23 #include "ash/system/tray/system_tray_item.h"	23 #include "ash/system/tray/system_tray_item.h"

24 #include "ash/test/ash_test_base.h"	24 #include "ash/test/ash_test_base.h"

25 #include "ash/wm/window_util.h"	25 #include "ash/wm/window_util.h"

26 #include "base/command_line.h"	26 #include "base/command_line.h"

27 #include "base/utf_string_conversions.h"	27 #include "base/strings/utf_string_conversions.h"

28 #include "ui/aura/client/aura_constants.h"	28 #include "ui/aura/client/aura_constants.h"

29 #include "ui/aura/root_window.h"	29 #include "ui/aura/root_window.h"

30 #include "ui/aura/test/event_generator.h"	30 #include "ui/aura/test/event_generator.h"

31 #include "ui/aura/window.h"	31 #include "ui/aura/window.h"

32 #include "ui/base/animation/animation_container_element.h"	32 #include "ui/base/animation/animation_container_element.h"

33 #include "ui/compositor/layer.h"	33 #include "ui/compositor/layer.h"

34 #include "ui/compositor/layer_animator.h"	34 #include "ui/compositor/layer_animator.h"

35 #include "ui/gfx/display.h"	35 #include "ui/gfx/display.h"

36 #include "ui/gfx/screen.h"	36 #include "ui/gfx/screen.h"

37 #include "ui/views/controls/label.h"	37 #include "ui/views/controls/label.h"

(...skipping 1393 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1431 EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());	1431 EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());

1432 } else {	1432 } else {

1433 EXPECT_FALSE(shelf->IsVisible());	1433 EXPECT_FALSE(shelf->IsVisible());

1434 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());	1434 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());

1435 }	1435 }

1436 }	1436 }

1437 }	1437 }

1438	1438

1439 } // namespace internal	1439 } // namespace internal

1440 } // namespace ash	1440 } // namespace ash

OLD	NEW