summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main.cc
diff options
context:
space:
mode:
authormad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-22 18:18:30 +0000
committermad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-22 18:18:30 +0000
commit382255a53861cb2eec39b85bf06aed7a05e22530 (patch)
treedb01430552f74fb29eea2ca66678db08d07dc40b /chrome/browser/chrome_browser_main.cc
parentd15de39b1eafcbf26ea106e96e60d29ce5588c34 (diff)
downloadchromium_src-382255a53861cb2eec39b85bf06aed7a05e22530.zip
chromium_src-382255a53861cb2eec39b85bf06aed7a05e22530.tar.gz
chromium_src-382255a53861cb2eec39b85bf06aed7a05e22530.tar.bz2
Revert 152788 - Give access to browsers by Profile/HostDesktopType.
And fix existing callers of FindBrowserForProfile. BUG=None TEST=Make sure that the page cyclers still work (they're one of the users of the API), as well as the download page gets opened properly on the Mac when the user chooses to wait (the other user of the API). Review URL: https://chromiumcodereview.appspot.com/10855183 TBR=mad@chromium.org Review URL: https://chromiumcodereview.appspot.com/10870014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
-rw-r--r--chrome/browser/chrome_browser_main.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 6c30a1f..bd6cf1f 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -928,10 +928,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
void ChromeBrowserMainParts::RunPageCycler() {
CommandLine* command_line = CommandLine::ForCurrentProcess();
- // 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);
+ Browser* browser = browser::FindBrowserWithProfile(profile_);
DCHECK(browser);
PageCycler* page_cycler = NULL;
FilePath input_file =