diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 13:43:42 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 13:43:42 +0000 |
| commit | 659f73fa7b0a91ceef30e89fff34629f39853761 (patch) | |
| tree | 54856047a10c8ba93f82c725cb0e3ee5283e707d /app | |
| parent | b2be7a6889ea1af900760b6e69e22152f652e950 (diff) | |
| download | chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.zip chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.tar.gz chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.tar.bz2 | |
Turn NULL used as int to 0.
(Excluding chrome/browser/...)
Landing patch for Jacob Mandelson. Original review: http://codereview.chromium.org/195067
BUG=none
TEST=base_unittests & app_unittests
Review URL: http://codereview.chromium.org/267076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/clipboard/clipboard_linux.cc | 2 | ||||
| -rw-r--r-- | app/gfx/native_widget_types.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/clipboard/clipboard_linux.cc b/app/clipboard/clipboard_linux.cc index 8b30ffd..bc8a0b4 100644 --- a/app/clipboard/clipboard_linux.cc +++ b/app/clipboard/clipboard_linux.cc @@ -204,7 +204,7 @@ void Clipboard::WriteBookmark(const char* title_data, size_t title_len, // Write as a URI. char* data = new char[url_len + 1]; memcpy(data, url_data, url_len); - data[url_len] = NULL; + data[url_len] = '\0'; InsertMapping(kMimeURI, data, url_len + 1); } diff --git a/app/gfx/native_widget_types.h b/app/gfx/native_widget_types.h index d116d9c..0153194 100644 --- a/app/gfx/native_widget_types.h +++ b/app/gfx/native_widget_types.h @@ -129,13 +129,16 @@ NativeViewId IdFromNativeView(NativeView view); // window id. #if defined(OS_WIN) typedef HWND PluginWindowHandle; + const PluginWindowHandle kNullPluginWindow = NULL; #elif defined(USE_X11) typedef unsigned long PluginWindowHandle; + const PluginWindowHandle kNullPluginWindow = 0; #else // On OS X we don't have windowed plugins. // We use a NULL/0 PluginWindowHandle in shared code to indicate there // is no window present, so mirror that behavior here. typedef bool PluginWindowHandle; + const PluginWindowHandle kNullPluginWindow = false; #endif } // namespace gfx |