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

Side by Side Diff: chrome/browser/browser.cc

Issue 373022: Enable and implement last 2 items in bookmark bar context menu: "Open... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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
« no previous file with comments | « chrome/app/nibs/BookmarkBar.xib ('k') | chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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/browser.h" 5 #include "chrome/browser/browser.h"
6 6
7 #include "app/animation.h" 7 #include "app/animation.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/keyboard_codes.h" 10 #include "base/keyboard_codes.h"
(...skipping 2392 matching lines...) Expand 10 before | Expand all | Expand 10 after
2403 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true); 2403 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true);
2404 2404
2405 // Show various bits of UI 2405 // Show various bits of UI
2406 command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, true); 2406 command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, true);
2407 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false); 2407 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
2408 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, true); 2408 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, true);
2409 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, true); 2409 command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, true);
2410 command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true); 2410 command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true);
2411 command_updater_.UpdateCommandEnabled(IDC_SELECT_PROFILE, true); 2411 command_updater_.UpdateCommandEnabled(IDC_SELECT_PROFILE, true);
2412 command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true); 2412 command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
2413 #if !defined(OS_MACOSX) // http://crbug.com/13149
2413 command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true); 2414 command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true);
2415 #endif
2414 command_updater_.UpdateCommandEnabled(IDC_SHOW_EXTENSION_SHELF, true); 2416 command_updater_.UpdateCommandEnabled(IDC_SHOW_EXTENSION_SHELF, true);
2415 command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true); 2417 command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
2416 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true); 2418 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true);
2417 2419
2418 ExtensionsService* extensions_service = profile()->GetExtensionsService(); 2420 ExtensionsService* extensions_service = profile()->GetExtensionsService();
2419 bool enable_extensions = 2421 bool enable_extensions =
2420 extensions_service && extensions_service->extensions_enabled(); 2422 extensions_service && extensions_service->extensions_enabled();
2421 command_updater_.UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS, 2423 command_updater_.UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS,
2422 enable_extensions); 2424 enable_extensions);
2423 2425
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
3023 /////////////////////////////////////////////////////////////////////////////// 3025 ///////////////////////////////////////////////////////////////////////////////
3024 // BrowserToolbarModel (private): 3026 // BrowserToolbarModel (private):
3025 3027
3026 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() { 3028 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
3027 // This |current_tab| can be NULL during the initialization of the 3029 // This |current_tab| can be NULL during the initialization of the
3028 // toolbar during window creation (i.e. before any tabs have been added 3030 // toolbar during window creation (i.e. before any tabs have been added
3029 // to the window). 3031 // to the window).
3030 TabContents* current_tab = browser_->GetSelectedTabContents(); 3032 TabContents* current_tab = browser_->GetSelectedTabContents();
3031 return current_tab ? &current_tab->controller() : NULL; 3033 return current_tab ? &current_tab->controller() : NULL;
3032 } 3034 }
OLDNEW
« no previous file with comments | « chrome/app/nibs/BookmarkBar.xib ('k') | chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698