Merge from Chromium at DEPS revision 33.0.1750.29

This commit was generated by merge_to_master.py. Change-Id: I1ad39a3dffafbde2b517578820a3b4d77d690d56

Merge from Chromium at DEPS revision 33.0.1750.29
This commit was generated by merge_to_master.py. Change-Id: I1ad39a3dffafbde2b517578820a3b4d77d690d56
d8f2b4b0 · Torne (Richard Coles) · b4efa9af · d8f2b4b0 · d8f2b4b0 · d8f2b4b0
Commit d8f2b4b0 authored 11 years ago by Torne (Richard Coles)
20 changed files
--- a/chrome/browser/resources/chromeos/wallpaper_manager/main.html
+++ b/chrome/browser/resources/chromeos/wallpaper_manager/main.html
@@ -7,6 +7,7 @@ found in the LICENSE file.
 -->
 <html i18n-values="dir:textdirection;">
 <head>
+  <meta charset="utf-8">
  <title>Wallpaper Picker</title>
  <link rel="stylesheet" href="../../../../../ui/webui/resources/css/widgets.css">
  <link rel="stylesheet" href="../../../../../ui/webui/resources/css/menu.css"></link>

--- a/chrome/browser/resources/enhanced_bookmark_manager/main.html
+++ b/chrome/browser/resources/enhanced_bookmark_manager/main.html
@@ -9,6 +9,7 @@ found in the LICENSE file.
 -->
 <head>
 <meta name="google" value="notranslate">
+<meta charset="utf-8">
 <title i18n-content="title"></title>

 <link rel="stylesheet" href="chrome://resources/css/list.css">

--- a/chrome/browser/resources/file_manager/main.html
+++ b/chrome/browser/resources/file_manager/main.html
@@ -186,7 +186,7 @@
      <command id="zip-selection"
               i18n-values="label:ZIP_SELECTION_BUTTON_LABEL">
      <command id="share" i18n-values="label:SHARE_BUTTON_LABEL"
-               shortcut="U+00BE" hideShortcutText><!-- Shortcut: '.' -->
+               shortcut="U+00BE" hide-shortcut-text><!-- Shortcut: '.' -->

      <command id="zoom-in" shortcut="U+00BB-Ctrl">
      <command id="zoom-out" shortcut="U+00BD-Ctrl">

--- a/chrome/browser/resources/http_auth.html
+++ b/chrome/browser/resources/http_auth.html
 <!DOCTYPE html>
 <html i18n-values="dir:textdirection">
 <head>
+  <meta charset="utf-8">
  <link rel="stylesheet" href="dialog.css">
  <style>
    body {

--- a/chrome/browser/resources/local_ntp/local_ntp.html
+++ b/chrome/browser/resources/local_ntp/local_ntp.html
@@ -7,6 +7,7 @@
  <script src="chrome-search://local-ntp/config.js"></script>
  <script src="chrome-search://local-ntp/local-ntp.js"></script>
  <link rel="stylesheet" href="chrome-search://local-ntp/local-ntp.css"></link>
+  <meta charset="utf-8">
  <meta name="google" value="notranslate">
 </head>
 <body>

--- a/chrome/browser/resources/managed_mode_block_interstitial.html
+++ b/chrome/browser/resources/managed_mode_block_interstitial.html
@@ -2,6 +2,7 @@
 <html i18n-values="dir:textdirection">
 <head>
 <meta name="viewport" content="width=device-width">
+<meta charset="utf-8">
 <title i18n-content="blockPageTitle"></title>
 <link rel="stylesheet" href="managed_mode_block_interstitial.css">
 <script src="../../../ui/webui/resources/js/cr.js"></script>

--- a/chrome/browser/resources/net_internals/index.html
+++ b/chrome/browser/resources/net_internals/index.html
@@ -6,6 +6,7 @@ Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
  <head>
+    <meta charset="utf-8">
    <!-- Don't use automatic scaling on mobile -->
    <meta name="viewport" content="width=device-width, initial-scale=1.0,
                                   maximum-scale=1.0, user-scalable=no">

--- a/chrome/browser/resources/network_speech_synthesis/tts_extension.js
+++ b/chrome/browser/resources/network_speech_synthesis/tts_extension.js
@@ -136,6 +136,9 @@ TtsExtension.prototype = {
        gender = this.voiceNameToLangAndGender_[options.voiceName].gender;
      }

+      if (!lang)
+        lang = navigator.language;
+
      // Look up the specific voice name for this language and gender.
      // If it's not in the map, it doesn't matter - the language will
      // be used directly. This is only used for languages where more

--- a/chrome/browser/resources/notification_1line.html
+++ b/chrome/browser/resources/notification_1line.html
 <!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
  <title>$2</title>
  <style>
  body {

--- a/chrome/browser/resources/notification_2line.html
+++ b/chrome/browser/resources/notification_2line.html
 <!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
  <title>$1</title>
  <style type="text/css">
  #title {

--- a/chrome/browser/resources/notification_icon.html
+++ b/chrome/browser/resources/notification_icon.html
 <!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
  <title>$2</title>
  <style>
  body {

--- a/chrome/browser/resources/ntp4/guest_tab.html
+++ b/chrome/browser/resources/ntp4/guest_tab.html
 <!DOCTYPE html>
 <html i18n-values="dir:textdirection;bookmarkbarattached:bookmarkbarattached">
 <head>
+<meta charset="utf-8">
 <title i18n-content="title"></title>
 <link rel="stylesheet" href="guest_tab.css">
 <script>

--- a/chrome/browser/resources/ntp4/incognito_tab.html
+++ b/chrome/browser/resources/ntp4/incognito_tab.html
 <!DOCTYPE html>
 <html i18n-values="dir:textdirection;bookmarkbarattached:bookmarkbarattached">
 <head>
+<meta charset="utf-8">
 <title i18n-content="title"></title>
 <link rel="stylesheet" href="incognito_tab.css">
 <script>

--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -842,7 +842,7 @@
    </div>
  </section>
 </if>
-  <section id="reset-profile-settings-section">
+  <section id="reset-profile-settings-section" hidden>
    <h3 i18n-content="resetProfileSettingsSectionTitle"></h3>
    <div>
      <span class="settings-row" i18n-content="resetProfileSettingsDescription">

--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -482,6 +482,8 @@ cr.define('options', function() {
      $('reset-profile-settings').onclick = function(event) {
        OptionsPage.navigateToPage('resetProfileSettings');
      };
+      $('reset-profile-settings-section').hidden =
+          !loadTimeData.getBoolean('enableResetProfileSettings');
    },

    /** @override */

--- a/chrome/browser/resources/predictors/predictors.html
+++ b/chrome/browser/resources/predictors/predictors.html
 <!DOCTYPE HTML>
 <html i18n-values="dir:textdirection;">
 <head>
+  <meta charset="utf-8">
  <title>Predictors</title>
  <link rel="stylesheet" href="chrome://resources/css/list.css">
  <link rel="stylesheet" href="chrome://resources/css/tabs.css">

--- a/chrome/browser/resources/quota_internals/main.html
+++ b/chrome/browser/resources/quota_internals/main.html
@@ -6,6 +6,7 @@ found in the LICENSE file.
 -->
 <html i18n-values="dir:textdirection;">
 <title>Quota Internals</title>
+<meta charset="utf-8">
 <link rel="stylesheet" href="main.css">

 <script src="chrome://resources/js/util.js"></script>

--- a/chrome/browser/resources/reader_out_of_date.html
+++ b/chrome/browser/resources/reader_out_of_date.html
 <!DOCTYPE html>
 <html>
 <head>
+<meta charset="utf-8">
 <title i18n-content="title"></title>
 <style type="text/css">
 body {

--- a/chrome/browser/resources/safe_browsing_multiple_threat_block.html
+++ b/chrome/browser/resources/safe_browsing_multiple_threat_block.html
 <!DOCTYPE html>
 <html id="template_root">
 <head>
+<meta charset="utf-8">
 <title i18n-content="title"></title>
 <style>
 body {

--- a/chrome/browser/resources/signin_internals/signin_index.html
+++ b/chrome/browser/resources/signin_internals/signin_index.html
 <!DOCTYPE HTML>
 <html i18n-values="dir:textdirection;">
 <head>
+  <meta charset="utf-8">
  <title>Signin Internals</title>
  <script src="chrome://resources/js/cr.js"></script>
  <script src="chrome://resources/js/util.js"></script>