Unverified Commit df87f8c8 authored by Alex Catarineu's avatar Alex Catarineu Committed by Matthew Finkel
Browse files

Bug 26345: Hide tracking protection UI

parent 292b5d4e

browser/base/content/browser-siteIdentity.js

+2 −2
Original line number Diff line number Diff line
@@ -921,10 +921,10 @@ var gIdentityHandler = { 
      gPermissionPanel.refreshPermissionIcons();

    }



    // Hide the shield icon if it is a chrome page.

    // Bug 26345: Hide tracking protection UI.

    gProtectionsHandler._trackingProtectionIconContainer.classList.toggle(

      "chromeUI",

      this._isSecureInternalUI

      true

    );

  },

browser/base/content/browser.xhtml

+2 −2
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ 
                        oncommand="gSync.toggleAccountPanel(this, event)"/>

        </toolbaritem>

        <toolbarseparator class="sync-ui-item"/>

        <toolbaritem>

        <toolbaritem hidden="true">

          <toolbarbutton id="appMenu-protection-report-button"

               class="subviewbutton subviewbutton-iconic"

               oncommand="gProtectionsHandler.openProtections(); gProtectionsHandler.recordClick('open_full_report', null, 'app_menu');">
@@ -782,7 +782,7 @@ 
            </label>

          </toolbarbutton>

        </toolbaritem>

        <toolbarseparator id="appMenu-tp-separator"/>

        <toolbarseparator hidden="true" id="appMenu-tp-separator"/>

        <toolbarbutton id="appMenu-new-window-button"

                       class="subviewbutton subviewbutton-iconic"

                       label="&newNavigatorCmd.label;"

browser/components/about/AboutRedirector.cpp

+0 −4
Original line number Diff line number Diff line
@@ -122,10 +122,6 @@ static const RedirEntry kRedirMap[] = { 
         nsIAboutModule::HIDE_FROM_ABOUTABOUT},

    {"restartrequired", "chrome://browser/content/aboutRestartRequired.xhtml",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},

    {"protections", "chrome://browser/content/protections.html",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |

         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS},

    {"ion", "chrome://browser/content/ion.html",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},

#ifdef TOR_BROWSER_UPDATE

browser/components/about/components.conf

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ pages = [ 
    'policies',

    'preferences',

    'privatebrowsing',

    'protections',

    'profiling',

    'reader',

    'restartrequired',

browser/components/moz.build

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ DIRS += [ 
    "preferences",

    "privatebrowsing",

    "prompts",

    "protections",

    "protocolhandler",

    "resistfingerprinting",

    "search",