chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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/macros.h"	9 #include "base/macros.h"

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

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

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

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

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

15 #include "build/build_config.h"	14 #include "build/build_config.h"

16 #include "chrome/app/chrome_command_ids.h"	15 #include "chrome/app/chrome_command_ids.h"

17 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	16 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

18 #include "chrome/browser/chrome_content_browser_client.h"	17 #include "chrome/browser/chrome_content_browser_client.h"

19 #include "chrome/browser/chrome_notification_types.h"	18 #include "chrome/browser/chrome_notification_types.h"

20 #include "chrome/browser/profiles/profile.h"	19 #include "chrome/browser/profiles/profile.h"

21 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"	20 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"

22 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h"	21 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h"

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

24 #include "chrome/browser/ui/browser_tabstrip.h"	23 #include "chrome/browser/ui/browser_tabstrip.h"

25 #include "chrome/browser/ui/browser_window.h"	24 #include "chrome/browser/ui/browser_window.h"

26 #include "chrome/browser/ui/tabs/tab_strip_model.h"	25 #include "chrome/browser/ui/tabs/tab_strip_model.h"

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

28 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"	27 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"

29 #include "chrome/common/chrome_content_client.h"	28 #include "chrome/common/chrome_content_client.h"

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

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

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

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

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

35 #include "chrome/test/base/ui_test_utils.h"	34 #include "chrome/test/base/ui_test_utils.h"

36 #include "chrome/test/base/view_event_test_base.h"	35 #include "chrome/test/base/view_event_test_base.h"

37 #include "components/bookmarks/browser/bookmark_model.h"	36 #include "components/bookmarks/browser/bookmark_model.h"

38 #include "components/bookmarks/common/bookmark_pref_names.h"	37 #include "components/bookmarks/common/bookmark_pref_names.h"

39 #include "components/bookmarks/test/bookmark_test_helpers.h"	38 #include "components/bookmarks/test/bookmark_test_helpers.h"

40 #include "components/constrained_window/constrained_window_views.h"	39 #include "components/constrained_window/constrained_window_views.h"

	40 #include "components/prefs/pref_service.h"

41 #include "content/public/browser/notification_service.h"	41 #include "content/public/browser/notification_service.h"

42 #include "content/public/browser/page_navigator.h"	42 #include "content/public/browser/page_navigator.h"

43 #include "content/public/test/test_browser_thread.h"	43 #include "content/public/test/test_browser_thread.h"

44 #include "ui/aura/env.h"	44 #include "ui/aura/env.h"

45 #include "ui/aura/env_observer.h"	45 #include "ui/aura/env_observer.h"

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

47 #include "ui/base/clipboard/clipboard.h"	47 #include "ui/base/clipboard/clipboard.h"

48 #include "ui/base/test/ui_controls.h"	48 #include "ui/base/test/ui_controls.h"

49 #include "ui/events/keycodes/keyboard_codes.h"	49 #include "ui/events/keycodes/keyboard_codes.h"

50 #include "ui/views/controls/button/menu_button.h"	50 #include "ui/views/controls/button/menu_button.h"

(...skipping 2276 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2327 // Menu should not be showing anymore.	2327 // Menu should not be showing anymore.

2328 views::MenuItemView* menu = bb_view_->GetMenu();	2328 views::MenuItemView* menu = bb_view_->GetMenu();

2329 ASSERT_TRUE(menu == nullptr);	2329 ASSERT_TRUE(menu == nullptr);

2330	2330

2331 Done();	2331 Done();

2332 }	2332 }

2333 };	2333 };

2334	2334

2335 VIEW_TEST(BookmarkBarViewTest26, CancelModeClosesMenu);	2335 VIEW_TEST(BookmarkBarViewTest26, CancelModeClosesMenu);

2336 #endif	2336 #endif

OLD	NEW