Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: chrome/browser/ui/toolbar/back_forward_menu_model.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "chrome/browser/event_disposition.h" 12 #include "chrome/browser/event_disposition.h"
13 #include "chrome/browser/prefs/pref_service.h" 13 #include "chrome/browser/prefs/pref_service.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_commands.h" 16 #include "chrome/browser/ui/browser_commands.h"
17 #include "chrome/browser/ui/browser_tabstrip.h"
17 #include "chrome/browser/ui/singleton_tabs.h" 18 #include "chrome/browser/ui/singleton_tabs.h"
18 #include "chrome/browser/ui/tab_contents/tab_contents.h" 19 #include "chrome/browser/ui/tab_contents/tab_contents.h"
19 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
20 #include "chrome/common/url_constants.h" 21 #include "chrome/common/url_constants.h"
21 #include "content/public/browser/favicon_status.h" 22 #include "content/public/browser/favicon_status.h"
22 #include "content/public/browser/navigation_controller.h" 23 #include "content/public/browser/navigation_controller.h"
23 #include "content/public/browser/navigation_entry.h" 24 #include "content/public/browser/navigation_entry.h"
24 #include "content/public/browser/user_metrics.h" 25 #include "content/public/browser/user_metrics.h"
25 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
26 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 } 410 }
410 411
411 string16 BackForwardMenuModel::GetShowFullHistoryLabel() const { 412 string16 BackForwardMenuModel::GetShowFullHistoryLabel() const {
412 return l10n_util::GetStringUTF16(IDS_SHOWFULLHISTORY_LINK); 413 return l10n_util::GetStringUTF16(IDS_SHOWFULLHISTORY_LINK);
413 } 414 }
414 415
415 WebContents* BackForwardMenuModel::GetWebContents() const { 416 WebContents* BackForwardMenuModel::GetWebContents() const {
416 // We use the test web contents if the unit test has specified it. 417 // We use the test web contents if the unit test has specified it.
417 return test_web_contents_ ? 418 return test_web_contents_ ?
418 test_web_contents_ : 419 test_web_contents_ :
419 browser_->GetActiveWebContents(); 420 chrome::GetActiveWebContents(browser_);
420 } 421 }
421 422
422 int BackForwardMenuModel::MenuIndexToNavEntryIndex(int index) const { 423 int BackForwardMenuModel::MenuIndexToNavEntryIndex(int index) const {
423 WebContents* contents = GetWebContents(); 424 WebContents* contents = GetWebContents();
424 int history_items = GetHistoryItemCount(); 425 int history_items = GetHistoryItemCount();
425 426
426 DCHECK_GE(index, 0); 427 DCHECK_GE(index, 0);
427 428
428 // Convert anything above the History items separator. 429 // Convert anything above the History items separator.
429 if (index < history_items) { 430 if (index < history_items) {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 metric_string += "ForwardMenu_"; 469 metric_string += "ForwardMenu_";
469 else 470 else
470 metric_string += "BackMenu_"; 471 metric_string += "BackMenu_";
471 metric_string += action; 472 metric_string += action;
472 if (index != -1) { 473 if (index != -1) {
473 // +1 is for historical reasons (indices used to start at 1). 474 // +1 is for historical reasons (indices used to start at 1).
474 metric_string += base::IntToString(index + 1); 475 metric_string += base::IntToString(index + 1);
475 } 476 }
476 return metric_string; 477 return metric_string;
477 } 478 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model_unittest.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698