diff options
| -rw-r--r-- | chrome/browser/possible_url_model.h | 4 | ||||
| -rw-r--r-- | chrome/browser/search_engines/template_url_prepopulate_data.h | 3 | ||||
| -rw-r--r-- | ppapi/cpp/paint_aggregator.h | 3 | ||||
| -rw-r--r-- | ui/gfx/codec/jpeg_codec.h | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/possible_url_model.h b/chrome/browser/possible_url_model.h index f2624d7..e368bad 100644 --- a/chrome/browser/possible_url_model.h +++ b/chrome/browser/possible_url_model.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -54,7 +54,7 @@ class PossibleURLModel : public ui::TableModel { ui::TableModelObserver* observer_; // Our consumer for favicon requests. - CancelableRequestConsumerT<size_t, NULL> consumer_; + CancelableRequestConsumerT<size_t, 0> consumer_; // The results we're showing. struct Result; diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.h b/chrome/browser/search_engines/template_url_prepopulate_data.h index f8b721a..5591fc9 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.h +++ b/chrome/browser/search_engines/template_url_prepopulate_data.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,6 +6,7 @@ #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_ #pragma once +#include <stddef.h> #include <vector> class GURL; diff --git a/ppapi/cpp/paint_aggregator.h b/ppapi/cpp/paint_aggregator.h index 3fe32a5..dd994c1 100644 --- a/ppapi/cpp/paint_aggregator.h +++ b/ppapi/cpp/paint_aggregator.h @@ -1,10 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #ifndef PPAPI_CPP_PAINT_AGGREGATOR_H_ #define PPAPI_CPP_PAINT_AGGREGATOR_H_ +#include <stddef.h> #include <vector> #include "ppapi/cpp/point.h" diff --git a/ui/gfx/codec/jpeg_codec.h b/ui/gfx/codec/jpeg_codec.h index 5ad4a4a8..df535c2 100644 --- a/ui/gfx/codec/jpeg_codec.h +++ b/ui/gfx/codec/jpeg_codec.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,6 +6,7 @@ #define UI_GFX_CODEC_JPEG_CODEC_H_ #pragma once +#include <stddef.h> #include <vector> class SkBitmap; |