diff options
| -rw-r--r-- | chrome/app/chrome_main_uitest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/chromeos/frame/browser_view.cc | 4 | ||||
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc index 7bd027b..ab79407f 100644 --- a/chrome/app/chrome_main_uitest.cc +++ b/chrome/app/chrome_main_uitest.cc @@ -18,11 +18,7 @@ TEST_F(ChromeMainTest, AppLaunch) { if (UITest::in_process_renderer()) { EXPECT_EQ(1, UITest::GetBrowserProcessCount()); } else { -#if defined(OS_CHROMEOS) - // On Chromeos we'll have five processes: browser, renderer, app launcher, - // zygote and sandbox helper. - EXPECT_EQ(5, UITest::GetBrowserProcessCount()); -#elif defined(OS_LINUX) +#if defined(OS_LINUX) // On Linux we'll have four processes: browser, renderer, zygote and // sandbox helper. EXPECT_EQ(4, UITest::GetBrowserProcessCount()); diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index 032cf2d..ca90857 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -388,7 +388,6 @@ void BrowserView::Init() { AddChildView(spacer_); InitSystemMenu(); - main_menu_.reset(new AppLauncher()); // The ContextMenuController has to be set to a NonClientView but // not to a NonClientFrameView because a TabStrip is not a child of @@ -459,6 +458,9 @@ void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { // views::ButtonListener overrides. void BrowserView::ButtonPressed(views::Button* sender, const views::Event& event) { + if (!main_menu_.get()) { + main_menu_.reset(new AppLauncher()); + } main_menu_->Show(browser()); } diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 7e4eb2e..1eedc25 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -59,11 +59,7 @@ class WorkerTest : public UILayoutTest { // The 1 is for the browser process. int number_of_processes = 1 + workers + (UITest::in_process_renderer() ? 0 : tabs); -#if defined(OS_CHROMEOS) - // On Chromeos, we also have a zygote process, a sandbox host process - // and app launcher's renderer. - number_of_processes += 3; -#elif defined(OS_LINUX) +#if defined(OS_LINUX) // On Linux, we also have a zygote process and a sandbox host process. number_of_processes += 2; #endif |