Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play.

chrome/browser/resources/plugins.css

Index: chrome/browser/resources/plugins.css
diff --git a/chrome/browser/resources/plugins.css b/chrome/browser/resources/plugins.css
index ab61cee98e8b7dd9348bcd995664a8fb21a428c9..398d5e7dd54d1ebbd148386c8548a0bf256d7341 100644
--- a/chrome/browser/resources/plugins.css
+++ b/chrome/browser/resources/plugins.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 The Chromium Authors. All rights reserved.
+ * Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -249,6 +249,10 @@ body.showTmiMode .showInTmiMode {
   margin-bottom: 0.2em;
 }
 
+.always-allow {
+  -webkit-margin-start: 30px;
+}
+
 button {
   font-size: 104%;
 }