From 8a7a668f1faaa60daec11e0107e3edd9e4e6ea6e Mon Sep 17 00:00:00 2001
From: "kherron%fmailbox.com"
 <kherron%fmailbox.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 14 Jul 2007 14:57:59 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20387077=20-=20Rename=20some=20class=20name?=
 =?UTF-8?q?s=20of=20the=20new=20Location=20bar.=20Patch=20by=20D=C3=A3o=20?=
 =?UTF-8?q?Gottwald=20<dao@design-noir.de>.=20r=3Dgavin.sharp.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@229960 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/base/content/urlbarBindings.xml   | 18 ++---
 .../themes/pinstripe/browser/browser.css      | 68 +++++++++---------
 .../themes/winstripe/browser/browser.css      | 69 +++++++++----------
 3 files changed, 74 insertions(+), 81 deletions(-)

diff --git a/mozilla/browser/base/content/urlbarBindings.xml b/mozilla/browser/base/content/urlbarBindings.xml
index f7212c0cb85..fead2a2074e 100644
--- a/mozilla/browser/base/content/urlbarBindings.xml
+++ b/mozilla/browser/base/content/urlbarBindings.xml
@@ -58,20 +58,20 @@
                         flex="1" allowevents="true"
                         xbl:inherits="tooltiptext=inputtooltiptext,onfocus,onblur,value,type,maxlength,disabled,size,readonly,userAction"/>
           </xul:hbox>
-          <xul:hbox anonid="presentation-box" class="textbox-presentation-box" flex="1"
+          <xul:hbox anonid="presentation-box" class="formatted-url" flex="1"
                     onmousedown="focus();" hidden="true">
-            <xul:scrollbox anonid="presentation" class="textbox-presentation" flex="1"
+            <xul:scrollbox anonid="presentation" class="formatted-url-contents" flex="1"
                            onoverflow="_contentIsCropped = true;"
                            onunderflow="_contentIsCropped = false;">
-              <xul:hbox anonid="prePath" class="textbox-presentation-prePath">
-                <xul:label anonid="protocol" class="textbox-presentation-protocol"/>
-                <xul:label anonid="subdomain" class="textbox-presentation-subdomain"/>
-                <xul:label anonid="domain" class="textbox-presentation-domain"/>
-                <xul:label anonid="port" class="textbox-presentation-port"/>
+              <xul:hbox anonid="prePath" class="formatted-url-prePath">
+                <xul:label anonid="protocol" class="formatted-url-protocol"/>
+                <xul:label anonid="subdomain" class="formatted-url-subdomain"/>
+                <xul:label anonid="domain" class="formatted-url-domain"/>
+                <xul:label anonid="port" class="formatted-url-port"/>
               </xul:hbox>
-              <xul:label anonid="path" class="textbox-presentation-path"/>
+              <xul:label anonid="path" class="formatted-url-path"/>
             </xul:scrollbox>
-            <xul:label anonid="overflow-ellipsis" class="textbox-overflow-ellipsis"
+            <xul:label anonid="overflow-ellipsis" class="formatted-url-ellipsis"
                        value="&#8230;" hidden="true"/>
           </xul:hbox>
         </xul:stack>
diff --git a/mozilla/browser/themes/pinstripe/browser/browser.css b/mozilla/browser/themes/pinstripe/browser/browser.css
index f2e00a37682..e6671ffc1ba 100755
--- a/mozilla/browser/themes/pinstripe/browser/browser.css
+++ b/mozilla/browser/themes/pinstripe/browser/browser.css
@@ -866,55 +866,51 @@ toolbar[iconsize="small"] #paste-button:hover:active {
   font: icon !important;
 }
 
-.textbox-presentation-box ,
-.textbox-presentation-box > * ,
-.textbox-presentation > * ,
-.textbox-presentation-prePath > * {
-  margin: 0;
-  padding: 0;
-  cursor: text;
-}
-
-.textbox-overflow-ellipsis {
-  -moz-margin-start: .3em;
-}
-
-.textbox-presentation-box {
+.formatted-url {
   -moz-box-align: center;
   margin: 0 3px;
   /*XXX Gecko 1.9 quirk*/
   -moz-padding-start: 1px;
 }
 
-#urlbar[protocolhidden="true"] .textbox-presentation-prePath > .textbox-presentation-slash ,
-#urlbar[protocolhidden="true"] .textbox-presentation-prePath > .textbox-presentation-subdomain {
+.formatted-url * {
+  margin: 0;
+  padding: 0;
+  cursor: text;
+}
+
+.formatted-url-contents {
+  color: graytext;
+}
+
+.formatted-url-domain {
+  color: -moz-fieldtext;
+}
+
+#urlbar[level="high"] .formatted-url-contents ,
+#urlbar[level="low"] .formatted-url-contents {
+  color: rgb(150, 150, 130);
+}
+
+#urlbar[level="low"] .formatted-url-domain ,
+#urlbar[level="high"] .formatted-url-domain {
+  color: black;
+}
+
+.formatted-url-ellipsis {
+  -moz-margin-start: .3em;
+}
+
+#urlbar[protocolhidden="true"] .formatted-url-prePath > .formatted-url-subdomain {
   -moz-box-flex: 1;
   text-align: right;
 }
 
-#urlbar[chromedir="rtl"][protocolhidden="true"] .textbox-presentation-prePath > .textbox-presentation-slash ,
-#urlbar[chromedir="rtl"][protocolhidden="true"] .textbox-presentation-prePath > .textbox-presentation-subdomain {
+#urlbar[protocolhidden="true"] .formatted-url-prePath > .formatted-url-port {
+  -moz-box-flex: 1;
   text-align: left;
 }
 
-.textbox-presentation {
-  color: graytext;
-}
-
-.textbox-presentation-domain {
-  color: -moz-fieldtext;
-}
-
-#urlbar[level="high"] .textbox-presentation ,
-#urlbar[level="low"] .textbox-presentation {
-  color: rgb(150, 150, 130);
-}
-
-#urlbar[level="low"] .textbox-presentation-domain ,
-#urlbar[level="high"] .textbox-presentation-domain {
-  color: black;
-}
-
 #urlbar[level="high"] > .autocomplete-textbox-container,
 #urlbar[level="low"] > .autocomplete-textbox-container
  {
diff --git a/mozilla/browser/themes/winstripe/browser/browser.css b/mozilla/browser/themes/winstripe/browser/browser.css
index 308f59e0b35..0da3f4e94d0 100644
--- a/mozilla/browser/themes/winstripe/browser/browser.css
+++ b/mozilla/browser/themes/winstripe/browser/browser.css
@@ -871,55 +871,52 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
   border: 1px solid;
 }
 
-.textbox-presentation-box ,
-.textbox-presentation-box > * ,
-.textbox-presentation > * ,
-.textbox-presentation-prePath > * {
-  margin: 0;
-  padding: 0;
-  cursor: text;
-}
-
-.textbox-overflow-ellipsis {
-  -moz-margin-start: .3em;
-}
-
-.textbox-presentation-box {
+.formatted-url {
   -moz-box-align: center;
   margin: 0 3px;
   /*XXX Gecko 1.9 quirk*/
   -moz-padding-start: 1px;
 }
 
-#urlbar[protocolhidden="true"] .textbox-presentation-prePath > .textbox-presentation-slash ,
-#urlbar[protocolhidden="true"] .textbox-presentation-prePath > .textbox-presentation-subdomain {
+.formatted-url * {
+  margin: 0;
+  padding: 0;
+  cursor: text;
+}
+
+.formatted-url-contents {
+  color: graytext;
+}
+
+.formatted-url-domain {
+  color: -moz-fieldtext;
+}
+
+#urlbar[level="high"] .formatted-url-contents ,
+#urlbar[level="low"] .formatted-url-contents {
+  color: rgb(150, 150, 130);
+}
+
+#urlbar[level="low"] .formatted-url-domain ,
+#urlbar[level="high"] .formatted-url-domain {
+  color: black;
+}
+
+.formatted-url-ellipsis {
+  -moz-margin-start: .3em;
+}
+
+#urlbar[protocolhidden="true"] .formatted-url-prePath > .formatted-url-subdomain ,
+#urlbar[protocolhidden="true"] .formatted-url-prePath > .formatted-url-port {
   -moz-box-flex: 1;
   text-align: right;
 }
 
-#urlbar[chromedir="rtl"][protocolhidden="true"] .textbox-presentation-prePath > .textbox-presentation-slash ,
-#urlbar[chromedir="rtl"][protocolhidden="true"] .textbox-presentation-prePath > .textbox-presentation-subdomain {
+#urlbar[chromedir="rtl"][protocolhidden="true"] .formatted-url-prePath > .formatted-url-subdomain ,
+#urlbar[chromedir="ltr"][protocolhidden="true"] .formatted-url-prePath > .formatted-url-port {
   text-align: left;
 }
 
-.textbox-presentation {
-  color: graytext;
-}
-
-.textbox-presentation-domain {
-  color: -moz-fieldtext;
-}
-
-#urlbar[level="high"] .textbox-presentation ,
-#urlbar[level="low"] .textbox-presentation {
-  color: rgb(150, 150, 130);
-}
-
-#urlbar[level="low"] .textbox-presentation-domain ,
-#urlbar[level="high"] .textbox-presentation-domain {
-  color: black;
-}
-
 #urlbar-container {
   -moz-box-orient: horizontal;
   -moz-box-align: stretch;