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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_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/bookmarks/bookmark_tab_helper.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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/instant/search.h"

5 #include "chrome/browser/search_engines/template_url_service.h"	6 #include "chrome/browser/search_engines/template_url_service.h"

6 #include "chrome/browser/search_engines/template_url_service_factory.h"	7 #include "chrome/browser/search_engines/template_url_service_factory.h"

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

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

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

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

11 #include "content/public/browser/navigation_entry.h"	11 #include "content/public/browser/navigation_entry.h"

12 #include "content/public/browser/web_contents.h"	12 #include "content/public/browser/web_contents.h"

13	13

14 typedef BrowserWithTestWindowTest BookmarkTest;	14 typedef BrowserWithTestWindowTest BookmarkTest;

15	15

16 // Verify that the detached bookmark bar is visible on the new tab page.	16 // Verify that the detached bookmark bar is visible on the new tab page.

17 TEST_F(BookmarkTest, DetachedBookmarkBarOnNTP) {	17 TEST_F(BookmarkTest, DetachedBookmarkBarOnNTP) {

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62	62

63 DISALLOW_COPY_AND_ASSIGN(BookmarkInstantExtendedTest);	63 DISALLOW_COPY_AND_ASSIGN(BookmarkInstantExtendedTest);

64 };	64 };

65	65

66 // Verify that in instant extended mode the detached bookmark bar is visible on	66 // Verify that in instant extended mode the detached bookmark bar is visible on

67 // the new tab page.	67 // the new tab page.

68 TEST_F(BookmarkInstantExtendedTest, DetachedBookmarkBarOnNTP) {	68 TEST_F(BookmarkInstantExtendedTest, DetachedBookmarkBarOnNTP) {

69 AddTab(browser(), GURL(chrome::kChromeUINewTabURL));	69 AddTab(browser(), GURL(chrome::kChromeUINewTabURL));

70 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());	70 EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());

71 }	71 }

OLD	NEW