chrome/browser/ui/search/search_delegate_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/search/search_delegate_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/search/search.cc ('k') | chrome/browser/ui/search/search_model.cc » ('j') | no next file with comments »

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/instant/search.h"

5 #include "chrome/browser/ui/browser.h"	6 #include "chrome/browser/ui/browser.h"

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

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

8 #include "chrome/browser/ui/search/search_tab_helper.h"	8 #include "chrome/browser/ui/search/search_tab_helper.h"

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

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

11	11

12 namespace chrome {	12 namespace chrome {

13 namespace search {	13 namespace search {

14	14

15 typedef BrowserWithTestWindowTest SearchDelegateTest;	15 typedef BrowserWithTestWindowTest SearchDelegateTest;

16	16

(...skipping 24 matching lines...) Expand all Loading...
41	41

42 // The first tab is not active so changes should not propagate.	42 // The first tab is not active so changes should not propagate.

43 web_contents = browser()->tab_strip_model()->GetWebContentsAt(0);	43 web_contents = browser()->tab_strip_model()->GetWebContentsAt(0);

44 chrome::search::SearchTabHelper::FromWebContents(web_contents)->model()->	44 chrome::search::SearchTabHelper::FromWebContents(web_contents)->model()->

45 SetMode(Mode(Mode::MODE_NTP, Mode::ORIGIN_NTP));	45 SetMode(Mode(Mode::MODE_NTP, Mode::ORIGIN_NTP));

46 EXPECT_TRUE(browser()->search_model()->mode().is_search());	46 EXPECT_TRUE(browser()->search_model()->mode().is_search());

47 }	47 }

48	48

49 } // namespace search	49 } // namespace search

50 } // namespace chrome	50 } // namespace chrome

OLD	NEW