Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 10855183: Give access to browsers by Profile/HostDesktopType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Now Ash and Native desktop types are the same on ChromeOS Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/ui/browser_finder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index bd6cf1f84abc0f098a8894f8a1c1af14f002f441..6c30a1fe68261f5ecd74dcd898630203d065cfe1 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -928,7 +928,10 @@ void ChromeBrowserMainParts::PostBrowserStart() {
void ChromeBrowserMainParts::RunPageCycler() {
CommandLine* command_line = CommandLine::ForCurrentProcess();
- Browser* browser = browser::FindBrowserWithProfile(profile_);
+ // We assume a native desktop for tests, but we will need to find a way to
+ // get the proper host desktop type once we start running these tests in ASH.
+ Browser* browser = browser::FindBrowserWithProfile(
+ profile_, chrome::HOST_DESKTOP_TYPE_NATIVE);
DCHECK(browser);
PageCycler* page_cycler = NULL;
FilePath input_file =
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/ui/browser_finder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698