website_settings: Fix Website Settings popup for chrome://bookmarks.

chrome/browser/ui/website_settings/website_settings_utils.cc

Index: chrome/browser/ui/website_settings/website_settings_utils.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_utils.cc b/chrome/browser/ui/website_settings/website_settings_utils.cc
index 7e90ac45179491510c9e917556d6827d9c1711fb..53c32ad80746a16f778a5996b74a126c18cf1842 100644
--- a/chrome/browser/ui/website_settings/website_settings_utils.cc
+++ b/chrome/browser/ui/website_settings/website_settings_utils.cc
@@ -4,11 +4,14 @@
 
 #include "chrome/browser/ui/website_settings/website_settings_utils.h"
 
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 
 // Returns true if the passed |url| refers to an internal chrome page.
 bool InternalChromePage(const GURL& url) {
   return url.SchemeIs(chrome::kChromeInternalScheme) ||
-         url.SchemeIs(chrome::kChromeUIScheme);
+         url.SchemeIs(chrome::kChromeUIScheme) ||
+         (url.SchemeIs(chrome::kExtensionScheme) &&
+          url.host() == extension_misc::kBookmarkManagerId);

[markusheintz_, 2012/09/24 18:36:21]

I think we only need to test for url.SchemeIs(chrome::kExtensionScheme).

I think the website settings UI should not be displayed for  any URL starting
with the scheme "chrome-extension".

Also this method us unfortunatly not used by Mac (see
chrome/browser/ui/cocoa/website_settings_controller.mm

But I think I can fix this in a separate CL.

[tfarina, 2012/09/24 19:19:03]

Done.

 }