diff options
| author | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-09 03:02:14 +0000 |
|---|---|---|
| committer | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-09 03:02:14 +0000 |
| commit | 2c9f0151c9248b25b4c62bc7ff7bd3534f41769c (patch) | |
| tree | 8a52df5d85e579dd221ea9ef1a2badb9058c9022 | |
| parent | 601200787981824b1c9d85fcff90304dfaaf772f (diff) | |
| download | chromium_src-2c9f0151c9248b25b4c62bc7ff7bd3534f41769c.zip chromium_src-2c9f0151c9248b25b4c62bc7ff7bd3534f41769c.tar.gz chromium_src-2c9f0151c9248b25b4c62bc7ff7bd3534f41769c.tar.bz2 | |
Change 0 to False in several grit if-expressions.
Grit r150 (https://codereview.chromium.org/156443002) starts enforcing
that if-expressions must evaluate to a boolean value. To comply, we need
to make this change in a few places:
Before: <if expr="0">
After: <if expr="False">
Review URL: https://codereview.chromium.org/133813009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249970 0039d316-1c4b-4281-b951-d872f2087c98
6 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/main.html b/chrome/browser/resources/chromeos/wallpaper_manager/main.html index 27b799e..e0eb600 100644 --- a/chrome/browser/resources/chromeos/wallpaper_manager/main.html +++ b/chrome/browser/resources/chromeos/wallpaper_manager/main.html @@ -14,7 +14,7 @@ found in the LICENSE file. <link rel="stylesheet" href="css/wallpaper_manager.css"> <script src="js/main_scripts.js"></script> - <if expr="0"> + <if expr="False"> <!-- This file has not been flattened, load individual scripts. Keep the list in sync with js/main_scripts.js. --> <script src="../../../../../ui/webui/resources/js/cr.js"></script> diff --git a/chrome/browser/resources/file_manager/audio_player.html b/chrome/browser/resources/file_manager/audio_player.html index 96b9ed3..6de77ee 100644 --- a/chrome/browser/resources/file_manager/audio_player.html +++ b/chrome/browser/resources/file_manager/audio_player.html @@ -14,10 +14,10 @@ <link rel="stylesheet" type="text/css" href="audio_player/css/audio_player.css"> <!-- Don't load mediaplayer_scripts.js when flattening is disabled --> - <if expr="0"><!-- </if> + <if expr="False"><!-- </if> <script src="audio_player/js/audio_player_scripts.js"></script> - <if expr="0"> --></if> - <if expr="0"> + <if expr="False"> --></if> + <if expr="False"> <!-- This section is used when the file manager is loaded with 'filemgr-ext-path' command-line flag. --> <!-- Keep the list in sync with audio_player_scripts.js. --> diff --git a/chrome/browser/resources/file_manager/gallery.html b/chrome/browser/resources/file_manager/gallery.html index 02e3e4f..a42f9ed 100644 --- a/chrome/browser/resources/file_manager/gallery.html +++ b/chrome/browser/resources/file_manager/gallery.html @@ -12,11 +12,11 @@ <link rel="stylesheet" href="foreground/css/media_controls.css"> <!-- Don't load gallery_scripts.js when flattening is disabled --> - <if expr="0"><!-- </if> + <if expr="False"><!-- </if> <script src="foreground/js/photo/gallery_scripts.js"></script> - <if expr="0"> --></if> + <if expr="False"> --></if> - <if expr="0"> + <if expr="False"> <!-- This section is used when the file manager is loaded with 'filemgr-ext-path' command-line flag. --> <!-- Keep the list in sync with gallery_scripts.js. --> diff --git a/chrome/browser/resources/file_manager/main.html b/chrome/browser/resources/file_manager/main.html index 94c8ac2..cfe86e4 100644 --- a/chrome/browser/resources/file_manager/main.html +++ b/chrome/browser/resources/file_manager/main.html @@ -26,11 +26,11 @@ <link rel="stylesheet" href="foreground/css/common.css"></link> <!-- Don't load main_scripts.js when flattening is disabled. --> - <if expr="0"><!-- </if> + <if expr="False"><!-- </if> <script src="foreground/js/main_scripts.js"></script> - <if expr="0"> --></if> + <if expr="False"> --></if> - <if expr="0"> + <if expr="False"> <!-- This section is used when the file manager is loaded with 'filemgr-ext-path' command-line flag. --> <!-- Keep the list in sync with js/main_scripts.js. --> diff --git a/chrome/browser/resources/file_manager/mediaplayer.html b/chrome/browser/resources/file_manager/mediaplayer.html index 80e2730..31fa435 100644 --- a/chrome/browser/resources/file_manager/mediaplayer.html +++ b/chrome/browser/resources/file_manager/mediaplayer.html @@ -16,11 +16,11 @@ <link rel="stylesheet" type="text/css" href="foreground/css/audio_player.css"> <!-- Don't load mediaplayer_scripts.js when flattening is disabled --> - <if expr="0"><!-- </if> + <if expr="False"><!-- </if> <script src="foreground/js/media/mediaplayer_scripts.js"></script> - <if expr="0"> --></if> + <if expr="False"> --></if> - <if expr="0"> + <if expr="False"> <!-- This section is used when the file manager is loaded with 'filemgr-ext-path' command-line flag. --> <!-- Keep the list in sync with mediaplayer_scripts.js. --> diff --git a/chrome/browser/resources/file_manager/video_player.html b/chrome/browser/resources/file_manager/video_player.html index 46d4fa8..cb1ac0a 100644 --- a/chrome/browser/resources/file_manager/video_player.html +++ b/chrome/browser/resources/file_manager/video_player.html @@ -15,11 +15,11 @@ <link rel="stylesheet" type="text/css" href="foreground/css/video_player.css"> <!-- Don't load video_player_scripts.js when flattening is disabled --> - <if expr="0"><!-- </if> + <if expr="False"><!-- </if> <script src="foreground/js/media/video_player_scripts.js"></script> - <if expr="0"> --></if> + <if expr="False"> --></if> - <if expr="0"> + <if expr="False"> <!-- This section is used when the file manager is loaded with 'filemgr-ext-path' command-line flag. --> <!-- Keep the list in sync with video_player_scripts.js. --> |