chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc - Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/

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

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 7 years, 9 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

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/bookmarks/bookmark_bar_view.h"	5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"

6	6

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

	8 #include "chrome/browser/instant/search.h"

8 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/browser/search_engines/template_url_service.h"	10 #include "chrome/browser/search_engines/template_url_service.h"

10 #include "chrome/browser/search_engines/template_url_service_factory.h"	11 #include "chrome/browser/search_engines/template_url_service_factory.h"

11 #include "chrome/browser/ui/search/search.h"

12 #include "chrome/common/pref_names.h"	12 #include "chrome/common/pref_names.h"

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

14 #include "chrome/test/base/browser_with_test_window_test.h"	14 #include "chrome/test/base/browser_with_test_window_test.h"

15 #include "ui/views/controls/button/text_button.h"	15 #include "ui/views/controls/button/text_button.h"

16	16

17 typedef BrowserWithTestWindowTest BookmarkBarViewTest;	17 typedef BrowserWithTestWindowTest BookmarkBarViewTest;

18	18

19 // Verify that the apps shortcut is never visible without instant extended.	19 // Verify that the apps shortcut is never visible without instant extended.

20 TEST_F(BookmarkBarViewTest, NoAppsShortcutWithoutInstantExtended) {	20 TEST_F(BookmarkBarViewTest, NoAppsShortcutWithoutInstantExtended) {

21 profile()->CreateBookmarkModel(true);	21 profile()->CreateBookmarkModel(true);

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 prefs::kShowAppsShortcutInBookmarkBar, false);	63 prefs::kShowAppsShortcutInBookmarkBar, false);

64 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());	64 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());

65 browser()->profile()->GetPrefs()->SetBoolean(	65 browser()->profile()->GetPrefs()->SetBoolean(

66 prefs::kShowAppsShortcutInBookmarkBar, true);	66 prefs::kShowAppsShortcutInBookmarkBar, true);

67 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());	67 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());

68 // Make sure we can also properly transition from true to false.	68 // Make sure we can also properly transition from true to false.

69 browser()->profile()->GetPrefs()->SetBoolean(	69 browser()->profile()->GetPrefs()->SetBoolean(

70 prefs::kShowAppsShortcutInBookmarkBar, false);	70 prefs::kShowAppsShortcutInBookmarkBar, false);

71 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());	71 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());

72 }	72 }

OLD	NEW