diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /chrome/browser/back_forward_menu_model.cc | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'chrome/browser/back_forward_menu_model.cc')
| -rw-r--r-- | chrome/browser/back_forward_menu_model.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/back_forward_menu_model.cc b/chrome/browser/back_forward_menu_model.cc index fb18da8..c7ecfd1 100644 --- a/chrome/browser/back_forward_menu_model.cc +++ b/chrome/browser/back_forward_menu_model.cc @@ -9,11 +9,11 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_number_conversions.h" -#include "chrome/browser/browser.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/ui/browser.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -137,8 +137,7 @@ void BackForwardMenuModel::ActivatedAt(int index) { } void BackForwardMenuModel::ActivatedAtWithDisposition( - int index, - WindowOpenDisposition disposition) { + int index, int disposition) { Profile* profile = browser_->profile(); DCHECK(!IsSeparator(index)); @@ -147,7 +146,7 @@ void BackForwardMenuModel::ActivatedAtWithDisposition( if (index == GetItemCount() - 1) { UserMetrics::RecordComputedAction(BuildActionName("ShowFullHistory", -1), profile); - browser_->ShowSingletonTab(GURL(chrome::kChromeUIHistoryURL)); + browser_->ShowSingletonTab(GURL(chrome::kChromeUIHistoryURL), false); return; } @@ -162,8 +161,8 @@ void BackForwardMenuModel::ActivatedAtWithDisposition( } int controller_index = MenuIndexToNavEntryIndex(index); - if (!browser_->NavigateToIndexWithDisposition(controller_index, - disposition)) { + if (!browser_->NavigateToIndexWithDisposition( + controller_index, static_cast<WindowOpenDisposition>(disposition))) { NOTREACHED(); } } |