diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 17:17:47 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 17:17:47 +0000 |
commit | 91e88da95bdd96592d7e2d4d77aabe4bc1ae80b3 (patch) | |
tree | 2d9e9d02b5d404a64cee8b86126e202d57ba9a04 /chrome/browser/ui/tabs | |
parent | 5262a5a54e955081a6994d4f82b868e9ac57af14 (diff) | |
download | chromium_src-91e88da95bdd96592d7e2d4d77aabe4bc1ae80b3.zip chromium_src-91e88da95bdd96592d7e2d4d77aabe4bc1ae80b3.tar.gz chromium_src-91e88da95bdd96592d7e2d4d77aabe4bc1ae80b3.tar.bz2 |
tabs: Do not use vector::at() accessor for retrieving elements.
From Peter:
"at() is both extremely uncommon and informally banned in Chromium code.
at() explicitly bounds-checks all accesses and throws an exception when the
check fails."
And it's less readable -- it's both more verbose and less idiomatic.
See http://codereview.chromium.org/10458045/ for reference.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10470003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tabs')
-rw-r--r-- | chrome/browser/ui/tabs/tab_strip_model.cc | 16 | ||||
-rw-r--r-- | chrome/browser/ui/tabs/tab_strip_model_unittest.cc | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc index 7fc0b32..913f473 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.cc +++ b/chrome/browser/ui/tabs/tab_strip_model.cc @@ -243,7 +243,7 @@ TabContentsWrapper* TabStripModel::DetachTabContentsAt(int index) { TabContentsWrapper* removed_contents = GetContentsAt(index); bool was_selected = IsTabSelected(index); int next_selected_index = order_controller_->DetermineNewSelectedIndex(index); - delete contents_data_.at(index); + delete contents_data_[index]; contents_data_.erase(contents_data_.begin() + index); ForgetOpenersAndGroupsReferencing( &(removed_contents->web_contents()->GetController())); @@ -433,7 +433,7 @@ bool TabStripModel::TabsAreLoading() const { NavigationController* TabStripModel::GetOpenerOfTabContentsAt(int index) { DCHECK(ContainsIndex(index)); - return contents_data_.at(index)->opener; + return contents_data_[index]->opener; } void TabStripModel::SetOpenerOfTabContentsAt( @@ -528,15 +528,15 @@ void TabStripModel::ForgetAllOpeners() { void TabStripModel::ForgetGroup(TabContentsWrapper* contents) { int index = GetIndexOfTabContents(contents); DCHECK(ContainsIndex(index)); - contents_data_.at(index)->SetGroup(NULL); - contents_data_.at(index)->ForgetOpener(); + contents_data_[index]->SetGroup(NULL); + contents_data_[index]->ForgetOpener(); } bool TabStripModel::ShouldResetGroupOnSelect( TabContentsWrapper* contents) const { int index = GetIndexOfTabContents(contents); DCHECK(ContainsIndex(index)); - return contents_data_.at(index)->reset_group_on_select; + return contents_data_[index]->reset_group_on_select; } void TabStripModel::SetTabBlocked(int index, bool blocked) { @@ -715,7 +715,7 @@ void TabStripModel::AddTabContents(TabContentsWrapper* contents, index = GetIndexOfTabContents(contents); if (inherit_group && transition == content::PAGE_TRANSITION_TYPED) - contents_data_.at(index)->reset_group_on_select = true; + contents_data_[index]->reset_group_on_select = true; // TODO(sky): figure out why this is here and not in InsertTabContentsAt. When // here we seem to get failures in startup perf tests. @@ -1223,7 +1223,7 @@ void TabStripModel::InternalCloseTab(TabContentsWrapper* contents, TabContentsWrapper* TabStripModel::GetContentsAt(int index) const { CHECK(ContainsIndex(index)) << "Failed to find: " << index << " in: " << count() << " entries."; - return contents_data_.at(index)->contents; + return contents_data_[index]->contents; } void TabStripModel::NotifyIfTabDeactivated(TabContentsWrapper* contents) { @@ -1286,7 +1286,7 @@ void TabStripModel::SelectRelativeTab(bool next) { void TabStripModel::MoveTabContentsAtImpl(int index, int to_position, bool select_after_move) { - TabContentsData* moved_data = contents_data_.at(index); + TabContentsData* moved_data = contents_data_[index]; contents_data_.erase(contents_data_.begin() + index); contents_data_.insert(contents_data_.begin() + to_position, moved_data); diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 3a21cbe..287baca 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -304,7 +304,7 @@ class MockTabStripModelObserver : public TabStripModelObserver { State* GetStateAt(int index) const { DCHECK(index >= 0 && index < GetStateCount()); - return states_.at(index); + return states_[index]; } bool StateEquals(int index, const State& state) { |