chrome/browser/ui/app_list/app_list_controller_browsertest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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/app_list/app_list_controller_browsertest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/alternate_error_tab_observer.cc ('k') | chrome/browser/ui/app_list/app_list_util.cc » ('j') | no next file with comments »

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

6 #include "base/files/scoped_temp_dir.h"	6 #include "base/files/scoped_temp_dir.h"

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

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

8 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

9 #include "chrome/browser/prefs/pref_service.h"

10 #include "chrome/browser/profiles/profile_manager.h"	10 #include "chrome/browser/profiles/profile_manager.h"

11 #include "chrome/browser/ui/app_list/app_list_util.h"	11 #include "chrome/browser/ui/app_list/app_list_util.h"

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

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

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

15 #include "chrome/test/base/in_process_browser_test.h"	15 #include "chrome/test/base/in_process_browser_test.h"

16 #include "chrome/test/base/ui_test_utils.h"	16 #include "chrome/test/base/ui_test_utils.h"

17	17

18	18

19 // Browser Test for AppListController that runs on all platforms supporting	19 // Browser Test for AppListController that runs on all platforms supporting

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 // switches::kShowAppList.	86 // switches::kShowAppList.

87 ASSERT_TRUE(chrome::IsAppListVisible());	87 ASSERT_TRUE(chrome::IsAppListVisible());

88	88

89 // Create a browser to prevent shutdown when we dismiss the app list. We	89 // Create a browser to prevent shutdown when we dismiss the app list. We

90 // need to do this because switches::kShowAppList suppresses the creation of	90 // need to do this because switches::kShowAppList suppresses the creation of

91 // any browsers.	91 // any browsers.

92 CreateBrowser(chrome::GetCurrentAppListProfile());	92 CreateBrowser(chrome::GetCurrentAppListProfile());

93 chrome::DismissAppList();	93 chrome::DismissAppList();

94 }	94 }

95 #endif // defined(OS_WIN) && !defined(USE_AURA)	95 #endif // defined(OS_WIN) && !defined(USE_AURA)

OLD	NEW