summaryrefslogtreecommitdiffstats
path: root/chrome_frame/infobars
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame/infobars')
-rw-r--r--chrome_frame/infobars/infobar_manager.cc4
-rw-r--r--chrome_frame/infobars/internal/infobar_window.h2
-rw-r--r--chrome_frame/infobars/internal/subclassing_window_with_delegate.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/infobars/infobar_manager.cc b/chrome_frame/infobars/infobar_manager.cc
index 7d8e072..0dea3ac 100644
--- a/chrome_frame/infobars/infobar_manager.cc
+++ b/chrome_frame/infobars/infobar_manager.cc
@@ -1,11 +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.
#include "chrome_frame/infobars/infobar_manager.h"
#include "base/logging.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "chrome_frame/infobars/internal/host_window_manager.h"
#include "chrome_frame/infobars/internal/infobar_window.h"
diff --git a/chrome_frame/infobars/internal/infobar_window.h b/chrome_frame/infobars/internal/infobar_window.h
index 434c5cd..310fee8 100644
--- a/chrome_frame/infobars/internal/infobar_window.h
+++ b/chrome_frame/infobars/internal/infobar_window.h
@@ -6,7 +6,7 @@
#define CHROME_FRAME_INFOBARS_INTERNAL_INFOBAR_WINDOW_H_
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#include "chrome_frame/infobars/infobar_content.h"
diff --git a/chrome_frame/infobars/internal/subclassing_window_with_delegate.h b/chrome_frame/infobars/internal/subclassing_window_with_delegate.h
index 0321f2c9..9bb6ab28 100644
--- a/chrome_frame/infobars/internal/subclassing_window_with_delegate.h
+++ b/chrome_frame/infobars/internal/subclassing_window_with_delegate.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.
@@ -11,7 +11,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "chrome_frame/utils.h"
// Implements behavior common to HostWindowManager and DisplacedWindowManager.