Disable encoding menu item for chrome://bookmarks

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 3960 matching lines @@
   window_->SetStarredState(
       current_tab_wrapper->bookmark_tab_helper()->is_starred());
   command_updater_.UpdateCommandEnabled(IDC_VIEW_SOURCE,
       current_tab->controller().CanViewSource());
   command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION,
       current_tab->ShouldDisplayURL() && current_tab->GetURL().is_valid());
   if (is_devtools())
       command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, false);
 
   // Changing the encoding is not possible on Chrome-internal webpages.
   // Instead of using GetURL here, we use url() (which is the "real" url of the

[Peter Kasting, 2011/07/04 22:36:02]

This comment is now out-of-date, no?

[Alexei Svitkine (slow), 2011/07/05 14:18:13]

You're right - I removed the out of date comment.

Indeed, it also seems my previous simple change caused view-source:chrome://
URLs to get the encoding menu enabled. I've updated the code to handle those
specifically.

The virtual URL is the one that is actually displayed in the address bar (which
may have gotten rewritten by the URL rewriter i.e. in the case of
chrome://bookmarks from the chrome-extension:// URL, or in the case of
view-source: to add that prefix).

Can you review my updated CL?

   // 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_chrome_internal = (active_entry ?
-      active_entry->url().SchemeIs(chrome::kChromeUIScheme) : false);
+      active_entry->virtual_url().SchemeIs(chrome::kChromeUIScheme) : false);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_MENU,
       !is_chrome_internal && SavePackage::IsSavableContents(
           current_tab->contents_mime_type()));
 
   // Show various bits of UI
   // TODO(pinkerton): Disable app-mode in the model until we implement it
   // on the Mac. Be sure to remove both ifdefs. http://crbug.com/13148
 #if !defined(OS_MACOSX)
   command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS,
       web_app::IsValidUrl(current_tab->GetURL()));
@@ skipping 723 matching lines @@
     // end up querying state once they process the tab switch.
     return;
   }
 
   BookmarkBar::AnimateChangeType animate_type =
       (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ?
       BookmarkBar::ANIMATE_STATE_CHANGE :
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE;
   window_->BookmarkBarStateChanged(animate_type);
 }