History: Fix position of lock/unlock button

The lock/unlock button for the managed controls in the history page has been
misplaced by one of the patches. This moves it to somewhere else so it looks
fine again.

R=dubroy@chromium.org
BUG=
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/13568003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192577 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/history/history.css

@@ -22,14 +22,6 @@ html[dir=rtl] body.uber-frame > .page {
   display: none;
 }
 
-#lock-unlock-button {
-  float: right;
-}
-
-html[dir=rtl] #lock-unlock-button {
-  float: left;
-}
-
 #search-button {
   margin: 0;
 }
@@ -106,11 +98,11 @@ html[dir=rtl] #range-next {
   float: right;
 }
 
-#display-filter-controls label {
-  -webkit-margin-start: 6px;
+#display-filter-controls > * {
+  -webkit-margin-start: 8px;
 }
 
-#display-filter-controls label:not(:last-child) {
+#display-filter-controls > *:not(:last-child) {
   -webkit-border-end: 1px solid rgb(151, 156, 160);
   -webkit-margin-start: 0;
   padding: 0 6px 0 6px;

chrome/browser/resources/history/history.html

@@ -85,6 +85,7 @@
           <option i18n-content="rangeMonth" value="2"></option>
         </select>
       </label>
+      <button id="lock-unlock-button" i18n-content="unlockButton"></button>
     </div>
   </div>
 <if expr="not pp_ifdef('android')">
@@ -101,7 +102,6 @@
       <button id="block-selected" i18n-content="blockItems" disabled="disabled"
           hidden>
       </button>
-      <button id="lock-unlock-button" i18n-content="unlockButton"></button>
     </div>
     <div id="notification-bar" hidden></div>
   </div>