diff options
| author | keishi@google.com <keishi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 11:40:46 +0000 |
|---|---|---|
| committer | keishi@google.com <keishi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 11:40:46 +0000 |
| commit | 202802e4d3c9e8db08926199fa38c9a4301ba2d6 (patch) | |
| tree | 963d256222128c6fdb71a558c3a3ec9d20d21000 | |
| parent | ccb14ed1454d0c8a891cc980ece99b23a748492b (diff) | |
| download | chromium_src-202802e4d3c9e8db08926199fa38c9a4301ba2d6.zip chromium_src-202802e4d3c9e8db08926199fa38c9a4301ba2d6.tar.gz chromium_src-202802e4d3c9e8db08926199fa38c9a4301ba2d6.tar.bz2 | |
Show singleton tab instead of opening multiple help tabs.
BUG=87356
TEST=None
R=nkostylev@chromium.org,ben@chromium.org
Review URL: http://codereview.chromium.org/7276030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91548 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/browser.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/ui/browser.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index cdffb7b..b1acdeb 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -824,7 +824,7 @@ void RecordLastRunAppBundlePath() { break; case IDC_HELP_PAGE: if (Browser* browser = ActivateBrowser(lastProfile)) - browser->OpenHelpTab(); + browser->ShowHelpTab(); else Browser::OpenHelpWindow(lastProfile); break; diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 099c54c..ae074e7 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -748,7 +748,7 @@ void Browser::OpenDownloadsWindow(Profile* profile) { // static void Browser::OpenHelpWindow(Profile* profile) { Browser* browser = Browser::Create(profile); - browser->OpenHelpTab(); + browser->ShowHelpTab(); browser->window()->Show(); } @@ -1994,10 +1994,10 @@ void Browser::OpenUpdateChromeDialog() { window_->ShowUpdateChromeDialog(); } -void Browser::OpenHelpTab() { +void Browser::ShowHelpTab() { GURL help_url(kHelpContentUrl); GURL localized_help_url = google_util::AppendGoogleLocaleParam(help_url); - AddSelectedTabWithURL(localized_help_url, PageTransition::AUTO_BOOKMARK); + ShowSingletonTab(localized_help_url); } void Browser::OpenThemeGalleryTabAndActivate() { @@ -2424,7 +2424,7 @@ void Browser::ExecuteCommandWithDisposition( case IDC_ABOUT: OpenAboutChromeDialog(); break; case IDC_UPGRADE_DIALOG: OpenUpdateChromeDialog(); break; case IDC_VIEW_INCOMPATIBILITIES: ShowAboutConflictsTab(); break; - case IDC_HELP_PAGE: OpenHelpTab(); break; + case IDC_HELP_PAGE: ShowHelpTab(); break; #if defined(OS_CHROMEOS) case IDC_FILE_MANAGER: OpenFileManager(); break; case IDC_SYSTEM_OPTIONS: OpenSystemOptionsDialog(); break; diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index e6c5a78..546f0ae0 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -577,7 +577,7 @@ class Browser : public TabHandlerDelegate, void OpenInstantConfirmDialog(); void OpenAboutChromeDialog(); void OpenUpdateChromeDialog(); - void OpenHelpTab(); + void ShowHelpTab(); // Used by the "Get themes" link in the options dialog. void OpenThemeGalleryTabAndActivate(); void OpenAutofillHelpTabAndActivate(); |