| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" | 7 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 if (index < GetHistoryItemCount()) { | 188 if (index < GetHistoryItemCount()) { |
| 189 content::RecordComputedAction( | 189 content::RecordComputedAction( |
| 190 BuildActionName("HistoryClick", index)); | 190 BuildActionName("HistoryClick", index)); |
| 191 } else { | 191 } else { |
| 192 content::RecordComputedAction( | 192 content::RecordComputedAction( |
| 193 BuildActionName("ChapterClick", index - GetHistoryItemCount() - 1)); | 193 BuildActionName("ChapterClick", index - GetHistoryItemCount() - 1)); |
| 194 } | 194 } |
| 195 | 195 |
| 196 int controller_index = MenuIndexToNavEntryIndex(index); | 196 int controller_index = MenuIndexToNavEntryIndex(index); |
| 197 WindowOpenDisposition disposition = | 197 WindowOpenDisposition disposition = |
| 198 browser::DispositionFromEventFlags(event_flags); | 198 chrome::DispositionFromEventFlags(event_flags); |
| 199 if (!chrome::NavigateToIndexWithDisposition(browser_, | 199 if (!chrome::NavigateToIndexWithDisposition(browser_, |
| 200 controller_index, | 200 controller_index, |
| 201 disposition)) { | 201 disposition)) { |
| 202 NOTREACHED(); | 202 NOTREACHED(); |
| 203 } | 203 } |
| 204 } | 204 } |
| 205 | 205 |
| 206 void BackForwardMenuModel::MenuWillShow() { | 206 void BackForwardMenuModel::MenuWillShow() { |
| 207 content::RecordComputedAction(BuildActionName("Popup", -1)); | 207 content::RecordComputedAction(BuildActionName("Popup", -1)); |
| 208 requested_favicons_.clear(); | 208 requested_favicons_.clear(); |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 metric_string += "ForwardMenu_"; | 469 metric_string += "ForwardMenu_"; |
| 470 else | 470 else |
| 471 metric_string += "BackMenu_"; | 471 metric_string += "BackMenu_"; |
| 472 metric_string += action; | 472 metric_string += action; |
| 473 if (index != -1) { | 473 if (index != -1) { |
| 474 // +1 is for historical reasons (indices used to start at 1). | 474 // +1 is for historical reasons (indices used to start at 1). |
| 475 metric_string += base::IntToString(index + 1); | 475 metric_string += base::IntToString(index + 1); |
| 476 } | 476 } |
| 477 return metric_string; | 477 return metric_string; |
| 478 } | 478 } |
| OLD | NEW |