diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 22:28:58 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 22:28:58 +0000 |
commit | 4b4d1adc53b7e016b7966a38c48a31ec9e0aeda2 (patch) | |
tree | e4dbd1104b38920b387b0a94436a83ecfc7736e3 /chrome/browser/views | |
parent | 0b847e38433afef0b207c85ae593d39501696aad (diff) | |
download | chromium_src-4b4d1adc53b7e016b7966a38c48a31ec9e0aeda2.zip chromium_src-4b4d1adc53b7e016b7966a38c48a31ec9e0aeda2.tar.gz chromium_src-4b4d1adc53b7e016b7966a38c48a31ec9e0aeda2.tar.bz2 |
Cleanup part 6.
Lots of small things (mostly in spellcheck code), e.g.:
* L"" -> std::wstring()
* type *var; -> type* var;
* Fix parameter line-wrapping to comply with style guide
* Remove unnecessary classname scoping inside class delcaration
* Remove empty declaration
* Add/remove blank lines in hopes of increasing readability
* Add block ("{", "}") around local use of a temporary that is later redefined
* Fold temps into other statements where obvious
* Use std::find() instead of hand-rolling the same functionality
* Combine distinct cases in switch statements when they all do the same thing
* Range-check to avoid some algorithmic work when it's not needed
* at() -> []
...and various others. Pretty much every change stands on its own. Do not hesitate to complain about changes you think are unhelpful to the code, this change is something of a dumping ground. (I did try to avoid the sort of gratuitous "const"-adding that has gotten me in trouble before :). )
Review URL: http://codereview.chromium.org/13688
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6745 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r-- | chrome/browser/views/toolbar_view.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 766ecf8..6032d3b 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -610,18 +610,20 @@ void BrowserToolbarView::OnGetProfilesDone( // Store the latest list of profiles in the browser. browser_->set_user_data_dir_profiles(profiles); - std::vector<std::wstring>::const_iterator iter = profiles.begin(); // Add direct sub menu items for profiles. + std::vector<std::wstring>::const_iterator iter = profiles.begin(); for (int i = IDC_NEW_WINDOW_PROFILE_0; - i <= IDC_NEW_WINDOW_PROFILE_LAST && iter != profiles.end(); + (i <= IDC_NEW_WINDOW_PROFILE_LAST) && (iter != profiles.end()); ++i, ++iter) profiles_menu_->AppendMenuItemWithLabel(i, *iter); + // If there are more profiles then show "Other" link. if (iter != profiles.end()) { profiles_menu_->AppendSeparator(); profiles_menu_->AppendMenuItemWithLabel( IDC_SELECT_PROFILE, l10n_util::GetString(IDS_SELECT_PROFILE)); } + // Always show a link to select a new profile. profiles_menu_->AppendSeparator(); profiles_menu_->AppendMenuItemWithLabel( |