Commit bc4aded9 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

chromeos: use ScopedTabbedBrowserDisplayer in ChromeShellDelegate

ScopedTabbedBrowserDisplayer takes care of creation and showing if necessary.

BUG=none
TEST=none

Change-Id: Iba7055bddce6aa0cfe2b5d564ec3b653fd0ab9aa
Reviewed-on: https://chromium-review.googlesource.com/1155937Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579251}
parent df22b814
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "chrome/browser/ui/ash/session_util.h" #include "chrome/browser/ui/ash/session_util.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_navigator_params.h" #include "chrome/browser/ui/browser_navigator_params.h"
#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_tabstrip.h"
...@@ -107,17 +106,10 @@ void ChromeShellDelegate::PreInit() { ...@@ -107,17 +106,10 @@ void ChromeShellDelegate::PreInit() {
} }
void ChromeShellDelegate::OpenKeyboardShortcutHelpPage() const { void ChromeShellDelegate::OpenKeyboardShortcutHelpPage() const {
Profile* profile = ProfileManager::GetActiveUserProfile(); chrome::ScopedTabbedBrowserDisplayer scoped_tabbed_browser_displayer(
Browser* browser = chrome::FindTabbedBrowser(profile, false); ProfileManager::GetActiveUserProfile());
NavigateParams params(scoped_tabbed_browser_displayer.browser(),
if (!browser) { GURL(kKeyboardShortcutHelpPageUrl),
browser = new Browser(Browser::CreateParams(profile, true));
browser->window()->Show();
}
browser->window()->Activate();
NavigateParams params(browser, GURL(kKeyboardShortcutHelpPageUrl),
ui::PAGE_TRANSITION_AUTO_BOOKMARK); ui::PAGE_TRANSITION_AUTO_BOOKMARK);
params.disposition = WindowOpenDisposition::SINGLETON_TAB; params.disposition = WindowOpenDisposition::SINGLETON_TAB;
Navigate(&params); Navigate(&params);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment