diff options
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/browser.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/defaults.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/defaults.h | 7 |
4 files changed, 18 insertions, 4 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 506a50c..487d781 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -49,6 +49,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/defaults.h" #include "chrome/browser/diagnostics/diagnostics_main.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/platform_util.h" @@ -572,6 +573,7 @@ int ChromeMain(int argc, char** argv) { CommandLine* singleton_command_line = CommandLine::ForCurrentProcess(); singleton_command_line->AppendSwitch(switches::kDisableSync); singleton_command_line->AppendSwitch(switches::kDisableExtensions); + browser_defaults::bookmarks_enabled = false; } #endif diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index ac91d86..6981a1d 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1091,7 +1091,8 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) { // Show various bits of UI command_updater_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, show_main_ui); command_updater_.UpdateCommandEnabled(IDC_REPORT_BUG, show_main_ui); - command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, show_main_ui); + command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, + browser_defaults::bookmarks_enabled && show_main_ui); command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui); command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, show_main_ui && profile_->IsSyncAccessible()); @@ -3246,7 +3247,8 @@ void Browser::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT, true); command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true); command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true); - command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true); + command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, + browser_defaults::bookmarks_enabled); command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true); command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true); command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true); @@ -3292,7 +3294,8 @@ void Browser::InitCommandState() { #endif // Page-related commands - command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE, normal_window); + command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE, + browser_defaults::bookmarks_enabled && normal_window); // Clipboard commands command_updater_.UpdateCommandEnabled(IDC_COPY_URL, non_devtools_window); @@ -3339,7 +3342,7 @@ void Browser::UpdateCommandsForTabState() { // Page-related commands window_->SetStarredState(current_tab->is_starred()); command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS, - CanBookmarkAllTabs()); + browser_defaults::bookmarks_enabled && CanBookmarkAllTabs()); command_updater_.UpdateCommandEnabled(IDC_VIEW_SOURCE, current_tab->controller().CanViewSource()); // Instead of using GetURL here, we use url() (which is the "real" url of the diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc index 35844a7..8c2945a 100644 --- a/chrome/browser/defaults.cc +++ b/chrome/browser/defaults.cc @@ -77,4 +77,6 @@ const bool kBrowserAliveWithNoWindows = false; const bool kPhantomTabsEnabled = false; +bool bookmarks_enabled = true; + } // namespace browser_defaults diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h index 2167f3a..a0ef525 100644 --- a/chrome/browser/defaults.h +++ b/chrome/browser/defaults.h @@ -74,6 +74,13 @@ extern const bool kAlwaysOpenIncognitoWindow; // Are phantom tabs enabled? extern const bool kPhantomTabsEnabled; +//============================================================================= +// Runtime "const" - set only once after parsing command line option and should +// never be modified after that. + +// Are bookmark enabled? True by default. +extern bool bookmarks_enabled; + } // namespace browser_defaults #endif // CHROME_BROWSER_DEFAULTS_H_ |