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

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

Issue 7483003: Removed separator in bookmarks sub-menu if there are no bookmarks or folders to display (only fix... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/ui/toolbar/wrench_menu_model.h" 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 } 193 }
194 194
195 BookmarkSubMenuModel::~BookmarkSubMenuModel() {} 195 BookmarkSubMenuModel::~BookmarkSubMenuModel() {}
196 196
197 void BookmarkSubMenuModel::Build(Browser* browser) { 197 void BookmarkSubMenuModel::Build(Browser* browser) {
198 AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR); 198 AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR);
199 AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER); 199 AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
200 #if !defined(OS_CHROMEOS) 200 #if !defined(OS_CHROMEOS)
201 AddItemWithStringId(IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS_TITLE); 201 AddItemWithStringId(IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS_TITLE);
202 #endif 202 #endif
203 #if defined(OS_MACOSX) || defined(TOOLKIT_VIEWS) 203 #if defined(OS_MACOSX)
204 AddSeparator(); 204 AddSeparator();
205 #else 205 #else
206 // TODO: add submenu for bookmarks themselves, restore separator. 206 // TODO: add submenu for bookmarks themselves, restore separator.
207 #endif 207 #endif
208 } 208 }
209 209
210 210
211 //////////////////////////////////////////////////////////////////////////////// 211 ////////////////////////////////////////////////////////////////////////////////
212 // WrenchMenuModel 212 // WrenchMenuModel
213 213
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 &enable_increment, &enable_decrement); 552 &enable_increment, &enable_decrement);
553 } 553 }
554 zoom_label_ = l10n_util::GetStringFUTF16( 554 zoom_label_ = l10n_util::GetStringFUTF16(
555 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 555 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
556 } 556 }
557 557
558 string16 WrenchMenuModel::GetSyncMenuLabel() const { 558 string16 WrenchMenuModel::GetSyncMenuLabel() const {
559 return sync_ui_util::GetSyncMenuLabel( 559 return sync_ui_util::GetSyncMenuLabel(
560 browser_->profile()->GetOriginalProfile()->GetProfileSyncService()); 560 browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
561 } 561 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698