chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc - Issue 687903003: Cleanup: Remove unneeded ui_test_utils.h includes.

Side by Side Diff: chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc

Issue 687903003: Cleanup: Remove unneeded ui_test_utils.h includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix cros Created 6 years, 1 month 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 | « chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc ('k') | chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/ui/views/frame/browser_view.h"	5 #include "chrome/browser/ui/views/frame/browser_view.h"

6	6

7 #include "chrome/app/chrome_command_ids.h"	7 #include "chrome/app/chrome_command_ids.h"

8 #include "chrome/browser/autocomplete/autocomplete_controller.h"	8 #include "chrome/browser/autocomplete/autocomplete_controller.h"

9 #include "chrome/browser/search/search.h"	9 #include "chrome/browser/search/search.h"

10 #include "chrome/browser/ui/browser_commands.h"	10 #include "chrome/browser/ui/browser_commands.h"

11 #include "chrome/browser/ui/omnibox/omnibox_view.h"	11 #include "chrome/browser/ui/omnibox/omnibox_view.h"

12 #include "chrome/browser/ui/search/instant_test_utils.h"	12 #include "chrome/browser/ui/search/instant_test_utils.h"

13 #include "chrome/browser/ui/tabs/tab_strip_model.h"	13 #include "chrome/browser/ui/tabs/tab_strip_model.h"

14 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"	14 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"

15 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"	15 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"

16 #include "chrome/browser/ui/views/frame/top_container_view.h"	16 #include "chrome/browser/ui/views/frame/top_container_view.h"

17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"	17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

18 #include "chrome/browser/ui/views/tabs/tab.h"	18 #include "chrome/browser/ui/views/tabs/tab.h"

19 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"	19 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"

20 #include "chrome/common/instant_types.h"	20 #include "chrome/common/instant_types.h"

21 #include "chrome/common/url_constants.h"	21 #include "chrome/common/url_constants.h"

22 #include "chrome/test/base/in_process_browser_test.h"	22 #include "chrome/test/base/in_process_browser_test.h"

23 #include "chrome/test/base/ui_test_utils.h"

24 #include "ui/views/controls/webview/webview.h"	23 #include "ui/views/controls/webview/webview.h"

25 #include "ui/views/focus/focus_manager.h"	24 #include "ui/views/focus/focus_manager.h"

26 #include "ui/views/window/non_client_view.h"	25 #include "ui/views/window/non_client_view.h"

27	26

28 #if defined(OS_CHROMEOS)	27 #if defined(OS_CHROMEOS)

29 #include "chrome/browser/chrome_notification_types.h"	28 #include "chrome/browser/chrome_notification_types.h"

30 #include "content/public/browser/notification_service.h"	29 #include "content/public/browser/notification_service.h"

31 #include "ui/compositor/layer.h"	30 #include "ui/compositor/layer.h"

32 #include "ui/compositor/scoped_animation_duration_scale_mode.h"	31 #include "ui/compositor/scoped_animation_duration_scale_mode.h"

33 #endif	32 #endif

(...skipping 16 matching lines...) Expand all Loading...
50	49

51 // Focus starts in the location bar or one of its children.	50 // Focus starts in the location bar or one of its children.

52 EXPECT_TRUE(location_bar_view->Contains(focus_manager->GetFocusedView()));	51 EXPECT_TRUE(location_bar_view->Contains(focus_manager->GetFocusedView()));

53	52

54 chrome::ToggleFullscreenMode(browser());	53 chrome::ToggleFullscreenMode(browser());

55 EXPECT_TRUE(browser_view->IsFullscreen());	54 EXPECT_TRUE(browser_view->IsFullscreen());

56	55

57 // Focus is released from the location bar.	56 // Focus is released from the location bar.

58 EXPECT_FALSE(location_bar_view->Contains(focus_manager->GetFocusedView()));	57 EXPECT_FALSE(location_bar_view->Contains(focus_manager->GetFocusedView()));

59 }	58 }

OLD	NEW