chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc - Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type

Patch Set: Build fixes for Windows and Mac Created 5 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

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 "base/bind.h"	5 #include "base/bind.h"

6 #include "base/callback.h"	6 #include "base/callback.h"

7 #include "base/compiler_specific.h"	7 #include "base/compiler_specific.h"

8 #include "base/location.h"	8 #include "base/location.h"

9 #include "base/message_loop/message_loop.h"	9 #include "base/message_loop/message_loop.h"

10 #include "base/prefs/pref_service.h"	10 #include "base/prefs/pref_service.h"

11 #include "base/run_loop.h"	11 #include "base/run_loop.h"

12 #include "base/strings/string_number_conversions.h"	12 #include "base/strings/string_number_conversions.h"

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

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

15 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	15 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

16 #include "chrome/browser/chrome_content_browser_client.h"	16 #include "chrome/browser/chrome_content_browser_client.h"

17 #include "chrome/browser/chrome_notification_types.h"	17 #include "chrome/browser/chrome_notification_types.h"

18 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

19 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"	19 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"

20 #include "chrome/browser/ui/browser.h"	20 #include "chrome/browser/ui/browser.h"

21 #include "chrome/browser/ui/browser_tabstrip.h"	21 #include "chrome/browser/ui/browser_tabstrip.h"

22 #include "chrome/browser/ui/browser_window.h"	22 #include "chrome/browser/ui/browser_window.h"

	23 #include "chrome/browser/ui/host_desktop.h"

23 #include "chrome/browser/ui/tabs/tab_strip_model.h"	24 #include "chrome/browser/ui/tabs/tab_strip_model.h"

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

25 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"	26 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"

26 #include "chrome/common/chrome_content_client.h"	27 #include "chrome/common/chrome_content_client.h"

27 #include "chrome/common/pref_names.h"	28 #include "chrome/common/pref_names.h"

28 #include "chrome/test/base/interactive_test_utils.h"	29 #include "chrome/test/base/interactive_test_utils.h"

29 #include "chrome/test/base/scoped_testing_local_state.h"	30 #include "chrome/test/base/scoped_testing_local_state.h"

30 #include "chrome/test/base/test_browser_window.h"	31 #include "chrome/test/base/test_browser_window.h"

31 #include "chrome/test/base/testing_browser_process.h"	32 #include "chrome/test/base/testing_browser_process.h"

32 #include "chrome/test/base/testing_profile.h"	33 #include "chrome/test/base/testing_profile.h"

(...skipping 2198 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2231 };	2232 };

2232	2233

2233 #if defined(USE_OZONE)	2234 #if defined(USE_OZONE)

2234 // ozone bringup - http://crbug.com/401304	2235 // ozone bringup - http://crbug.com/401304

2235 #define MAYBE_ContextMenusKeyboardEscape DISABLED_ContextMenusKeyboardEscape	2236 #define MAYBE_ContextMenusKeyboardEscape DISABLED_ContextMenusKeyboardEscape

2236 #else	2237 #else

2237 #define MAYBE_ContextMenusKeyboardEscape ContextMenusKeyboardEscape	2238 #define MAYBE_ContextMenusKeyboardEscape ContextMenusKeyboardEscape

2238 #endif	2239 #endif

2239 VIEW_TEST(BookmarkBarViewTest24, MAYBE_ContextMenusKeyboardEscape)	2240 VIEW_TEST(BookmarkBarViewTest24, MAYBE_ContextMenusKeyboardEscape)

2240	2241

OLD	NEW