New ordering of permissions in the Origin Info Bubble.

chrome/browser/ui/website_settings/website_settings.cc

Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 1f36d34b28d5256a59f92e661a9b39b6954bbb19..d50846f09f4a74799f748ac4e79d4cab97f3e41a 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -101,19 +101,19 @@ ContentSettingsType kPermissionType[] = {
     CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
     CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
     CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
-    CONTENT_SETTINGS_TYPE_IMAGES,
+#if defined(OS_ANDROID)
+    CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,

[benwells, 2016/05/24 01:46:05]

Can you remind me why this is in the list?

[palmer, 2016/05/24 18:25:56]

No, because I don't know. :) See the comments from rolfe in the spreadsheet. It
sounds like we might coalesce push messaging permission with regular
notifications permission.

[benwells, 2016/05/25 00:51:36]

From some analysis and discussion with Tim we think this #if define is basically
dead - i.e. it could be removed without having any effect on anything.

Maybe we should do that in a separate CL though...

+#endif
     CONTENT_SETTINGS_TYPE_JAVASCRIPT,
+    CONTENT_SETTINGS_TYPE_PLUGINS,
+    CONTENT_SETTINGS_TYPE_IMAGES,
     CONTENT_SETTINGS_TYPE_POPUPS,
-    CONTENT_SETTINGS_TYPE_FULLSCREEN,
+    CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
+    CONTENT_SETTINGS_TYPE_KEYGEN,
     CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
-    CONTENT_SETTINGS_TYPE_PLUGINS,
     CONTENT_SETTINGS_TYPE_MOUSELOCK,
+    CONTENT_SETTINGS_TYPE_FULLSCREEN,
     CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
-#if defined(OS_ANDROID)
-    CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
-#endif
-    CONTENT_SETTINGS_TYPE_KEYGEN,
-    CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
 };
 
 // Determines whether to show permission |type| in the Website Settings UI. Only