diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 19:22:23 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 19:22:23 +0000 |
| commit | 6a3294658a85b4d0d1894d4f08af68a4cdf31bb0 (patch) | |
| tree | 4b921333653c51253153a70fd9af2d29c04a21e3 /chrome/browser/renderer_host | |
| parent | a263d56dd156e94f3453604d231e06a9bb1f537d (diff) | |
| download | chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.zip chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.tar.gz chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.tar.bz2 | |
Fix NULL vs 0 problems which break the build with -Werror using GCC 4.5
BUG=none
TEST=try to compile with gcc 4.5
Patch by Benjamin Jemlich <pcgod99@gmail.com>.
Review URL: http://codereview.chromium.org/2007003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/gtk_key_bindings_handler.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/renderer_host/gtk_key_bindings_handler.cc b/chrome/browser/renderer_host/gtk_key_bindings_handler.cc index c3c9ad4..8f3d765 100644 --- a/chrome/browser/renderer_host/gtk_key_bindings_handler.cc +++ b/chrome/browser/renderer_host/gtk_key_bindings_handler.cc @@ -13,8 +13,7 @@ #include "chrome/common/native_web_keyboard_event.h" GtkKeyBindingsHandler::GtkKeyBindingsHandler(GtkWidget* parent_widget) - : handler_(CreateNewHandler()), - edit_commands_(NULL) { + : handler_(CreateNewHandler()) { DCHECK(GTK_IS_FIXED(parent_widget)); // We need add the |handler_| object into gtk widget hierarchy, so that // gtk_bindings_activate_event() can find correct display and keymaps from diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index 59b2231..6c77f07 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -96,7 +96,7 @@ RenderWidgetHost::~RenderWidgetHost() { gfx::NativeViewId RenderWidgetHost::GetNativeViewId() { if (view_) return gfx::IdFromNativeView(view_->GetNativeView()); - return NULL; + return 0; } void RenderWidgetHost::Init() { |