Initial change that allows to disable bookmarks in Chrome for Chrome OS (BWSI...

chrome/browser/browser.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 1072 matching lines @@
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_PREVIOUS_PANE, main_not_fullscreen_or_popup);
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_BOOKMARKS, main_not_fullscreen_or_popup);
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_CHROMEOS_STATUS, main_not_fullscreen_or_popup);
 
   // Show various bits of UI
   command_updater_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_REPORT_BUG, show_main_ui);
+#if defined(OS_CHROMEOS)
+  command_updater_.UpdateCommandEnabled(

[sky, 2010/08/17 17:58:39]

Slews of ifdefs like this make the code really hard to follow. It would be
better to centralize this code in a common place. If you modify defaults to
contain the bookmarks_enabled boolean, then all this could would just be:
 command_updater_.UpdateCommandEnabled(..., defaults::bookmarks_enabled).

[Dmitry Polukhin, 2010/08/18 08:37:51]

I don't see "defaults::", I see only "browser_defaults::" that are all real
consts but we need runtime variable.

+      IDC_SHOW_BOOKMARK_BAR,
+      show_main_ui && !CommandLine::ForCurrentProcess()->
+          HasSwitch(switches::kDisableBookmarks));
+#else
   command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, show_main_ui);
+#endif
   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS,
       show_main_ui && profile_->IsSyncAccessible());
 
 #if defined(ENABLE_REMOTING)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) {
     command_updater_.UpdateCommandEnabled(IDC_REMOTING_SETUP, show_main_ui);
   }
 #endif
 
@@ skipping 2130 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true);
 
   // Show various bits of UI
   command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, true);
   command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
   command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, true);
   command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_CONSOLE, true);
   command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS_INSPECT, true);
   command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
+#if defined(OS_CHROMEOS)
+  command_updater_.UpdateCommandEnabled(
+      IDC_SHOW_BOOKMARK_MANAGER,
+      !CommandLine::ForCurrentProcess()->
+          HasSwitch(switches::kDisableBookmarks));
+#else
   command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true);
+#endif
   command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
   command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true);
   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true);
 
 #if defined(OS_CHROMEOS)
   command_updater_.UpdateCommandEnabled(IDC_SEARCH, true);
   command_updater_.UpdateCommandEnabled(IDC_SYSTEM_OPTIONS, true);
   command_updater_.UpdateCommandEnabled(IDC_INTERNET_OPTIONS, true);
 #endif
 
@@ skipping 25 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_4, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window);
 #if defined(OS_MACOSX)
   command_updater_.UpdateCommandEnabled(IDC_TABPOSE, normal_window);
 #endif
 
   // Page-related commands
+#if defined(OS_CHROMEOS)
+  command_updater_.UpdateCommandEnabled(
+      IDC_BOOKMARK_PAGE,
+      normal_window && !CommandLine::ForCurrentProcess()->
+          HasSwitch(switches::kDisableBookmarks));
+#else
   command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE, normal_window);
+#endif
 
   // Clipboard commands
   command_updater_.UpdateCommandEnabled(IDC_COPY_URL, non_devtools_window);
 
   // Find-in-page
   command_updater_.UpdateCommandEnabled(IDC_FIND, non_devtools_window);
   command_updater_.UpdateCommandEnabled(IDC_FIND_NEXT, non_devtools_window);
   command_updater_.UpdateCommandEnabled(IDC_FIND_PREVIOUS, non_devtools_window);
 
   // AutoFill
@@ skipping 25 matching lines @@
   bool non_app_window = !(type() & TYPE_APP);
   command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB,
       non_app_window && CanDuplicateContentsAt(selected_index()));
   command_updater_.UpdateCommandEnabled(IDC_SELECT_NEXT_TAB,
       non_app_window && tab_count() > 1);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_PREVIOUS_TAB,
       non_app_window && tab_count() > 1);
 
   // Page-related commands
   window_->SetStarredState(current_tab->is_starred());
+#if defined(OS_CHROMEOS)
+  command_updater_.UpdateCommandEnabled(
+      IDC_BOOKMARK_ALL_TABS,
+      CanBookmarkAllTabs() && !CommandLine::ForCurrentProcess()->
+          HasSwitch(switches::kDisableBookmarks));
+#else
   command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_ALL_TABS,
                                         CanBookmarkAllTabs());
+#endif
   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
   // page) from the NavigationEntry because its reflects their origin rather
   // than the display one (returned by GetURL) which may be different (like
   // having "view-source:" on the front).
   NavigationEntry* active_entry = nc.GetActiveEntry();
   bool is_savable_url =
       SavePackage::IsSavableURL(active_entry ? active_entry->url() : GURL());
   command_updater_.UpdateCommandEnabled(IDC_SAVE_PAGE, is_savable_url);
@@ skipping 775 matching lines @@
 }
 
 bool Browser::IsPinned(TabContents* source) {
   int index = tabstrip_model_.GetIndexOfTabContents(source);
   if (index == TabStripModel::kNoTab) {
     NOTREACHED() << "IsPinned called for tab not in our strip";
     return false;
   }
   return tabstrip_model_.IsTabPinned(index);
 }