diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 01:54:15 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 01:54:15 +0000 |
| commit | 3b63f8f451afcf414a59c529f627c620e4d449d9 (patch) | |
| tree | 2dcbab1c060b29a260c29bb19b67bf97a8293ca3 /chrome/browser/ui/cocoa | |
| parent | 9174a108509c2aafe513da68e6e63fbc7df38c85 (diff) | |
| download | chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.zip chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.tar.gz chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.tar.bz2 | |
Move some files from base to base/memory.
raw_scoped_refptr_mismatch_checker.h
ref_counted.cc
ref_counted.h
ref_counted_memory.cc
ref_counted_memory.h
ref_counted_unittest.cc
scoped_callback_factory.h
scoped_comptr_win.h
scoped_handle.h
scoped_native_library.cc
scoped_native_library.h
scoped_native_library_unittest.cc
scoped_nsobject.h
scoped_open_process.h
scoped_ptr.h
scoped_ptr_unittest.cc
scoped_temp_dir.cc
scoped_temp_dir.h
scoped_temp_dir_unittest.cc
scoped_vector.h
singleton.h
singleton_objc.h
singleton_unittest.cc
linked_ptr.h
linked_ptr_unittest.cc
weak_ptr.cc
weak_ptr.h
weak_ptr_unittest.cc
BUG=None
TEST=Compile
Review URL: http://codereview.chromium.org/6714032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa')
236 files changed, 447 insertions, 447 deletions
diff --git a/chrome/browser/ui/cocoa/about_ipc_controller.h b/chrome/browser/ui/cocoa/about_ipc_controller.h index f0d4075..52ea212 100644 --- a/chrome/browser/ui/cocoa/about_ipc_controller.h +++ b/chrome/browser/ui/cocoa/about_ipc_controller.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_message_utils.h" #include "third_party/GTM/Foundation/GTMRegex.h" diff --git a/chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm b/chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm index afde86e..3e1ce94 100644 --- a/chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/about_ipc_controller.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/about_window_controller_unittest.mm b/chrome/browser/ui/cocoa/about_window_controller_unittest.mm index 4b57809..ac46d8e 100644 --- a/chrome/browser/ui/cocoa/about_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/about_window_controller_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "chrome/browser/cocoa/keystone_glue.h" #import "chrome/browser/ui/cocoa/about_window_controller.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h index 24e9353..867dda5 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.h +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.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. @@ -19,7 +19,7 @@ template <typename T> struct DefaultSingletonTraits; // It is recommended that this class be used as a singleton so that the key map // isn't created multiple places. // -// #import "base/singleton.h" +// #import "base/memory/singleton.h" // ... // AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance(); // return keymap->GetAcceleratorForCommand(IDC_COPY); diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm index 1b8f3d7..3ec2ed5 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm @@ -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. @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "chrome/app/chrome_command_ids.h" namespace { diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm b/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm index 2a39ffe..c6e2346 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/animatable_image.h b/chrome/browser/ui/cocoa/animatable_image.h index a6f8ab9..54eac84 100644 --- a/chrome/browser/ui/cocoa/animatable_image.h +++ b/chrome/browser/ui/cocoa/animatable_image.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. @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #import <QuartzCore/QuartzCore.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // This class helps animate an NSImage's frame and opacity. It works by creating // a blank NSWindow in the size specified and giving it a layer on which the diff --git a/chrome/browser/ui/cocoa/animatable_view.h b/chrome/browser/ui/cocoa/animatable_view.h index 2bd121a..aa417d2 100644 --- a/chrome/browser/ui/cocoa/animatable_view.h +++ b/chrome/browser/ui/cocoa/animatable_view.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. @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/background_gradient_view.h" #import "chrome/browser/ui/cocoa/view_resizer.h" diff --git a/chrome/browser/ui/cocoa/animatable_view_unittest.mm b/chrome/browser/ui/cocoa/animatable_view_unittest.mm index b9073a8..e59eae9 100644 --- a/chrome/browser/ui/cocoa/animatable_view_unittest.mm +++ b/chrome/browser/ui/cocoa/animatable_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/animatable_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/view_resizer_pong.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h index 293d738d..e55f933 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h +++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h @@ -8,7 +8,7 @@ #import <objc/objc-runtime.h> #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/app_controller_mac.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm index d695f6c..9a01d2f 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "base/string16.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm index fbdbf09..b62ef8b 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm index 2cd5a94..51f079c 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm index 56b38c7..24b5857 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h" #include "base/logging.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm index c8659b7..36530e2 100644 --- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm @@ -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. #import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h" #include "base/logging.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index ab9b827..4c8c4b4 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -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. @@ -6,7 +6,7 @@ #include "base/file_path.h" #include "base/logging.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/save_package.h" diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm index d9213de..f006e11 100644 --- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm @@ -1,12 +1,12 @@ -// 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. #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" #include "base/logging.h" -#import "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#import "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" #import "chrome/browser/app_controller_mac.h" #import "chrome/browser/chrome_browser_application_mac.h" diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm b/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm index 96eb930..b1bee22 100644 --- a/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm +++ b/chrome/browser/ui/cocoa/applescript/window_applescript_test.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #import "chrome/browser/app_controller_mac.h" #import "chrome/browser/chrome_browser_application_mac.h" diff --git a/chrome/browser/ui/cocoa/background_gradient_view_unittest.mm b/chrome/browser/ui/cocoa/background_gradient_view_unittest.mm index 693c21a..73040d2 100644 --- a/chrome/browser/ui/cocoa/background_gradient_view_unittest.mm +++ b/chrome/browser/ui/cocoa/background_gradient_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/background_gradient_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/background_tile_view_unittest.mm b/chrome/browser/ui/cocoa/background_tile_view_unittest.mm index 4af5751..8b14e63 100644 --- a/chrome/browser/ui/cocoa/background_tile_view_unittest.mm +++ b/chrome/browser/ui/cocoa/background_tile_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/background_tile_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.h b/chrome/browser/ui/cocoa/base_bubble_controller.h index 216406b..27d750e 100644 --- a/chrome/browser/ui/cocoa/base_bubble_controller.h +++ b/chrome/browser/ui/cocoa/base_bubble_controller.h @@ -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. #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace BaseBubbleControllerInternal { class Bridge; diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.mm b/chrome/browser/ui/cocoa/base_bubble_controller.mm index 3f1ff1d..7b1f247 100644 --- a/chrome/browser/ui/cocoa/base_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/base_bubble_controller.mm @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/mac/mac_util.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/string_util.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #include "content/common/notification_observer.h" diff --git a/chrome/browser/ui/cocoa/base_view.h b/chrome/browser/ui/cocoa/base_view.h index bb2aeed..5dbc87b 100644 --- a/chrome/browser/ui/cocoa/base_view.h +++ b/chrome/browser/ui/cocoa/base_view.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "ui/gfx/rect.h" // A view that provides common functionality that many views will need: diff --git a/chrome/browser/ui/cocoa/base_view_unittest.mm b/chrome/browser/ui/cocoa/base_view_unittest.mm index bd356b4..1cc99d2 100644 --- a/chrome/browser/ui/cocoa/base_view_unittest.mm +++ b/chrome/browser/ui/cocoa/base_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/base_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm index bb0dc31..d71c6ec 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h index 3674a21..8175fb8 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h @@ -9,8 +9,8 @@ #import <Cocoa/Cocoa.h> #include <map> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_state.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index 52d20ce..7987328 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm index 3c20cf7..dff15be 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h index 5c9288c..439df79 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" #import "chrome/browser/ui/cocoa/tracking_area.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm index 05cb3fd..5b35e3b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/ui/cocoa/animation_utils.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h index 373e0e6..20ea39e 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" // Hover state machine. Encapsulates the hover state for diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm index 1eda2f5..f8813b5 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h index 7fe6608..4a245f0 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // Window for a bookmark folder "menu". This menu pops up when you diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm index c64de1e..808b796 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm @@ -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. #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" #import "base/logging.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" #import "chrome/browser/ui/cocoa/image_utils.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm index 7dd6c06..d1d1005 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm index 17cdcec..e946af2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/themes/theme_service.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm index ccfb564c..e5d2b7e 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h index e1d7bb4..1f94cd5 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h @@ -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. #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" class BookmarkBubbleNotificationBridge; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm index 40aafd7..48b0916 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm index b20642a..4c0c8b0 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" #include "base/logging.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/metrics/user_metrics.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm index 472ba54..e51478c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm index 49f54de..2f45d9e 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h index b39953b..fa487d9 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.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. @@ -9,8 +9,8 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_ptr.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_editor.h" class BookmarkEditorBaseControllerBridge; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm index a5c8c0e..bf64055 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h index 51aadb7..5b80b48 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.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. @@ -23,7 +23,7 @@ #include <map> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" class BookmarkNode; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index 6fcd4c2..caad0f6 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -4,7 +4,7 @@ #import <AppKit/AppKit.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_unittest.mm index ef251b0..cf444db 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_unittest.mm @@ -1,8 +1,8 @@ -// 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. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h index dcaac34..7868a69 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.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. @@ -23,7 +23,7 @@ #import <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm index b01769b..418ad2c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm @@ -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. #import <Cocoa/Cocoa.h> -#include "base/scoped_ptr.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" #import "chrome/browser/ui/cocoa/browser_test_helper.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h index 40f1cb1..1b95d4b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.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. @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_model.h" class BookmarkModelObserverForCocoa; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm index 822a8d2..99ace46 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" diff --git a/chrome/browser/ui/cocoa/browser_frame_view_unittest.mm b/chrome/browser/ui/cocoa/browser_frame_view_unittest.mm index ca2de67..87d9dc4 100644 --- a/chrome/browser/ui/cocoa/browser_frame_view_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_frame_view_unittest.mm @@ -1,11 +1,11 @@ -// 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. #import <Cocoa/Cocoa.h> #include <objc/runtime.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/browser_frame_view.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index 40e01b8..77abbc6 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ #pragma once -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/task.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm index a99e608..a68af29 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h index 4e9ea3a..d1e2859 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.h +++ b/chrome/browser/ui/cocoa/browser_window_controller.h @@ -13,8 +13,8 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/sync/sync_ui_util.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index e9ffedb..ffb2b82 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -9,7 +9,7 @@ #include "app/mac/scoped_nsdisable_screen_updates.h" #include "app/mac/nsimage_cache.h" #include "base/mac/mac_util.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_* #include "chrome/browser/bookmarks/bookmark_editor.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index f1cf08b..cceeb51 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index 6a602c7..a1f5be5 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/ui/cocoa/bubble_view.h b/chrome/browser/ui/cocoa/bubble_view.h index 755c8a4..448c813 100644 --- a/chrome/browser/ui/cocoa/bubble_view.h +++ b/chrome/browser/ui/cocoa/bubble_view.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // A view class that looks like a "bubble" with rounded corners and displays // text inside. Can be themed. To put flush against the sides of a window, the diff --git a/chrome/browser/ui/cocoa/bubble_view_unittest.mm b/chrome/browser/ui/cocoa/bubble_view_unittest.mm index 5d788ea..4b8850e 100644 --- a/chrome/browser/ui/cocoa/bubble_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bubble_view_unittest.mm @@ -1,9 +1,9 @@ -// 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. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bubble_view.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/bug_report_window_controller.h b/chrome/browser/ui/cocoa/bug_report_window_controller.h index c0c9384..272c5bf 100644 --- a/chrome/browser/ui/cocoa/bug_report_window_controller.h +++ b/chrome/browser/ui/cocoa/bug_report_window_controller.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. @@ -10,7 +10,7 @@ #include <vector> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" class Profile; class TabContents; diff --git a/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm b/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm index b0cbed5..614e760 100644 --- a/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/bug_report_window_controller.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window.h b/chrome/browser/ui/cocoa/chrome_event_processing_window.h index 3524d6f1a..be60afd 100644 --- a/chrome/browser/ui/cocoa/chrome_event_processing_window.h +++ b/chrome/browser/ui/cocoa/chrome_event_processing_window.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // Override NSWindow to access unhandled keyboard events (for command // processing); subclassing NSWindow is the only method to do diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm b/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm index f2fd657..ea6005e 100644 --- a/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm +++ b/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm @@ -1,11 +1,11 @@ -// 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. #include <Carbon/Carbon.h> #include "base/debug/debugger.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" diff --git a/chrome/browser/ui/cocoa/clickhold_button_cell.h b/chrome/browser/ui/cocoa/clickhold_button_cell.h index 89218cf..d38ccb8 100644 --- a/chrome/browser/ui/cocoa/clickhold_button_cell.h +++ b/chrome/browser/ui/cocoa/clickhold_button_cell.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/gradient_button_cell.h" // A button cell that implements "click hold" behavior after a specified delay diff --git a/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm b/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm index 7ccc773..f76f805 100644 --- a/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/clickhold_button_cell.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/cocoa_test_helper.h b/chrome/browser/ui/cocoa/cocoa_test_helper.h index d7e5692..085aa97 100644 --- a/chrome/browser/ui/cocoa/cocoa_test_helper.h +++ b/chrome/browser/ui/cocoa/cocoa_test_helper.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. @@ -10,7 +10,7 @@ #include "base/path_service.h" #import "base/mac/scoped_nsautorelease_pool.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "chrome/common/chrome_constants.h" #import "content/common/chrome_application_mac.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/command_observer_bridge_unittest.mm b/chrome/browser/ui/cocoa/command_observer_bridge_unittest.mm index 371bb2c..90c5b8a 100644 --- a/chrome/browser/ui/cocoa/command_observer_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/command_observer_bridge_unittest.mm @@ -1,11 +1,11 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_ptr.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/command_observer_bridge.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm index d83026f..1fe843c 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm @@ -6,7 +6,7 @@ #import <QuartzCore/QuartzCore.h> #include "base/logging.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm index 844ea0b..36aed30 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h" #include "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm index 620e7fb..adc1d6b 100644 --- a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm +++ b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm @@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/constrained_html_ui.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.h b/chrome/browser/ui/cocoa/constrained_window_mac.h index 629262b..2de151a 100644 --- a/chrome/browser/ui/cocoa/constrained_window_mac.h +++ b/chrome/browser/ui/cocoa/constrained_window_mac.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. @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" @class BrowserWindowController; @class GTMWindowSheetController; diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h index 86d0195..55fa117 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h @@ -5,8 +5,8 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/ui/cocoa/constrained_window_mac.h" #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h" diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm index fb7a330..de960ae 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" #include "content/browser/renderer_host/test_render_view_host.h" diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h index 362f3ea..6f59b99 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.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. @@ -7,8 +7,8 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/base_bubble_controller.h" class ContentSettingBubbleModel; diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm index 9f38322..1888be3 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm @@ -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. @@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/debug/debugger.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/content_setting_bubble_model.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/common/content_settings_types.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.h b/chrome/browser/ui/cocoa/content_settings/cookie_details.h index 050e379..a162336 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details.h +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.h @@ -1,13 +1,13 @@ -// 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. #import <Cocoa/Cocoa.h> +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/browsing_data_database_helper.h" #include "chrome/browser/browsing_data_indexed_db_helper.h" #include "chrome/browser/browsing_data_local_storage_helper.h" -#include "base/scoped_nsobject.h" #include "net/base/cookie_monster.h" #include "webkit/appcache/appcache_service.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h b/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h index 175a1b5..818e0ed 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h +++ b/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h" diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.h b/chrome/browser/ui/cocoa/dev_tools_controller.h index e8fa567..7de513e 100644 --- a/chrome/browser/ui/cocoa/dev_tools_controller.h +++ b/chrome/browser/ui/cocoa/dev_tools_controller.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. @@ -8,7 +8,7 @@ #import <Foundation/Foundation.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" @class NSSplitView; diff --git a/chrome/browser/ui/cocoa/dock_icon.mm b/chrome/browser/ui/cocoa/dock_icon.mm index 980519a..562326e 100644 --- a/chrome/browser/ui/cocoa/dock_icon.mm +++ b/chrome/browser/ui/cocoa/dock_icon.mm @@ -1,10 +1,10 @@ -// 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. #import "chrome/browser/ui/cocoa/dock_icon.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // The fraction of the size of the dock icon that the badge is. static const float kBadgeFraction = 0.4f; diff --git a/chrome/browser/ui/cocoa/download/download_item_button_unittest.mm b/chrome/browser/ui/cocoa/download/download_item_button_unittest.mm index bb0279d..acf0242 100644 --- a/chrome/browser/ui/cocoa/download/download_item_button_unittest.mm +++ b/chrome/browser/ui/cocoa/download/download_item_button_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/download/download_item_button.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.h b/chrome/browser/ui/cocoa/download/download_item_cell.h index 32415e0..91bceb5 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.h +++ b/chrome/browser/ui/cocoa/download/download_item_cell.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. @@ -7,7 +7,7 @@ #pragma once #import "base/mac/cocoa_protocols.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/gradient_button_cell.h" #include "base/file_path.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.h b/chrome/browser/ui/cocoa/download/download_item_controller.h index c41ff43..6d8fb44 100644 --- a/chrome/browser/ui/cocoa/download/download_item_controller.h +++ b/chrome/browser/ui/cocoa/download/download_item_controller.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" class BaseDownloadItemModel; diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.h b/chrome/browser/ui/cocoa/download/download_item_mac.h index 8eafb17..a15f670 100644 --- a/chrome/browser/ui/cocoa/download/download_item_mac.h +++ b/chrome/browser/ui/cocoa/download/download_item_mac.h @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/icon_manager.h" diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.h b/chrome/browser/ui/cocoa/download/download_shelf_controller.h index e75911f..6d3ba68 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_controller.h +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.h @@ -1,12 +1,12 @@ -// 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. #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/view_resizer.h" @class AnimatableView; diff --git a/chrome/browser/ui/cocoa/download/download_shelf_view.mm b/chrome/browser/ui/cocoa/download/download_shelf_view.mm index 417b4c3..3ab757c 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_view.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_view.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/download/download_shelf_view.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/themes/theme_service.h" #import "chrome/browser/ui/cocoa/themed_window.h" #import "chrome/browser/ui/cocoa/view_id_util.h" diff --git a/chrome/browser/ui/cocoa/download/download_shelf_view_unittest.mm b/chrome/browser/ui/cocoa/download/download_shelf_view_unittest.mm index 926593f..b7263fc 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_view_unittest.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_view_unittest.mm @@ -1,8 +1,8 @@ -// 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. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/download/download_shelf_view.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/draggable_button.mm b/chrome/browser/ui/cocoa/draggable_button.mm index d5520e4..25f3fe7 100644 --- a/chrome/browser/ui/cocoa/draggable_button.mm +++ b/chrome/browser/ui/cocoa/draggable_button.mm @@ -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. #import "chrome/browser/ui/cocoa/draggable_button.h" #include "base/logging.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" namespace { diff --git a/chrome/browser/ui/cocoa/draggable_button_unittest.mm b/chrome/browser/ui/cocoa/draggable_button_unittest.mm index 2700a49..110d306 100644 --- a/chrome/browser/ui/cocoa/draggable_button_unittest.mm +++ b/chrome/browser/ui/cocoa/draggable_button_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/draggable_button.h" #import "chrome/browser/ui/cocoa/test_event_utils.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.h b/chrome/browser/ui/cocoa/extensions/browser_action_button.h index a09ce7f..e8bad88 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.h +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.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. @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#import "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/gradient_button_cell.h" class Extension; diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm index 3d10e22..c6b1fa6 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm @@ -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. @@ -7,7 +7,7 @@ #include <algorithm> #include "base/basictypes.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/view_id_util.h" NSString* const kBrowserActionGrippyDragStartedNotification = diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm index 002aa05..14b5c1b 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h index 1f19863..02a26d9 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.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. @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#import "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" class Browser; @class BrowserActionButton; diff --git a/chrome/browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm b/chrome/browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm index 71c8929..4336c49c 100644 --- a/chrome/browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm @@ -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. #import "chrome/browser/ui/cocoa/extensions/chevron_menu_button.h" #import "chrome/browser/ui/cocoa/extensions/chevron_menu_button_cell.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" namespace { diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h index 9af03e1..ae4b5a2 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.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. @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_ptr.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" class AsyncUninstaller; class DevmodeObserver; diff --git a/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.h b/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.h index d160782..f1d0987 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.h +++ b/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.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. @@ -10,8 +10,8 @@ #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#import "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" @class ExtensionActionContextMenu; class ExtensionInfoBarDelegate; diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.h b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.h index b110217..75a9040 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.h +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.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. @@ -10,7 +10,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h index ad95fba..c9386cf 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.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. @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm index 5115d7d..9242796 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm @@ -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. @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_ptr.h" #include "base/values.h" #import "chrome/browser/browser_window.h" #import "chrome/browser/ui/cocoa/browser_test_helper.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h index d3fb422..edd144f 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.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. @@ -9,8 +9,8 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#import "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#import "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/cocoa/info_bubble_view.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm index a0b5614..3c183ae 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/memory/scoped_nsobject.h" #include "base/message_loop.h" -#include "base/scoped_nsobject.h" #include "chrome/browser/extensions/extension_pref_value_map.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_process_manager.h" diff --git a/chrome/browser/ui/cocoa/fast_resize_view_unittest.mm b/chrome/browser/ui/cocoa/fast_resize_view_unittest.mm index d64be3f..02ac295 100644 --- a/chrome/browser/ui/cocoa/fast_resize_view_unittest.mm +++ b/chrome/browser/ui/cocoa/fast_resize_view_unittest.mm @@ -1,8 +1,8 @@ -// 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. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/fast_resize_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h index 3ce8c2d..e231c7f 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "ui/gfx/point.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h index ee6785f..3ef6c65 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.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,7 +6,7 @@ #import "chrome/browser/ui/cocoa/styled_text_field_cell.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // FindBarTextFieldCell extends StyledTextFieldCell to provide support for a // results label rooted at the right edge of the cell. diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm index c65431c..a13e29a 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm index 836a82b..f9af9901 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm @@ -1,11 +1,11 @@ -// 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. #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_view_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_view_unittest.mm index ce80bec..fa597e2 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_view_unittest.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_view.h" #include "chrome/browser/ui/cocoa/test_event_utils.h" diff --git a/chrome/browser/ui/cocoa/find_pasteboard.h b/chrome/browser/ui/cocoa/find_pasteboard.h index f7153f6..175c8e5 100644 --- a/chrome/browser/ui/cocoa/find_pasteboard.h +++ b/chrome/browser/ui/cocoa/find_pasteboard.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. @@ -12,7 +12,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" extern NSString* kFindPasteboardChangedNotification; diff --git a/chrome/browser/ui/cocoa/find_pasteboard_unittest.mm b/chrome/browser/ui/cocoa/find_pasteboard_unittest.mm index 739eff3..e83635a 100644 --- a/chrome/browser/ui/cocoa/find_pasteboard_unittest.mm +++ b/chrome/browser/ui/cocoa/find_pasteboard_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/find_pasteboard.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/first_run_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/first_run_bubble_controller_unittest.mm index d9f37c93..c0a72ad 100644 --- a/chrome/browser/ui/cocoa/first_run_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/first_run_bubble_controller_unittest.mm @@ -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. @@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/debug/debugger.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index 2771dea..a4c4e96 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -1,12 +1,12 @@ -// 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. #import "chrome/browser/ui/cocoa/first_run_dialog.h" #include "base/mac/mac_util.h" +#include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/ref_counted.h" #include "base/sys_string_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/cocoa/focus_tracker.h b/chrome/browser/ui/cocoa/focus_tracker.h index f828979..e7f9e65 100644 --- a/chrome/browser/ui/cocoa/focus_tracker.h +++ b/chrome/browser/ui/cocoa/focus_tracker.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // A class that handles saving and restoring focus. An instance of // this class snapshots the currently focused view when it is diff --git a/chrome/browser/ui/cocoa/focus_tracker_unittest.mm b/chrome/browser/ui/cocoa/focus_tracker_unittest.mm index 9868cbd..b4aed78 100644 --- a/chrome/browser/ui/cocoa/focus_tracker_unittest.mm +++ b/chrome/browser/ui/cocoa/focus_tracker_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/focus_tracker.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/framed_browser_window.h b/chrome/browser/ui/cocoa/framed_browser_window.h index 719799d..cbc0a11 100644 --- a/chrome/browser/ui/cocoa/framed_browser_window.h +++ b/chrome/browser/ui/cocoa/framed_browser_window.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/chrome_browser_window.h" // Offsets from the top/left of the window frame to the top of the window diff --git a/chrome/browser/ui/cocoa/framed_browser_window_unittest.mm b/chrome/browser/ui/cocoa/framed_browser_window_unittest.mm index b9d96c0..8b42ab0 100644 --- a/chrome/browser/ui/cocoa/framed_browser_window_unittest.mm +++ b/chrome/browser/ui/cocoa/framed_browser_window_unittest.mm @@ -1,11 +1,11 @@ -// 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. #import <Cocoa/Cocoa.h> #include "base/debug/debugger.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/browser_frame_view.h" diff --git a/chrome/browser/ui/cocoa/fullscreen_window_unittest.mm b/chrome/browser/ui/cocoa/fullscreen_window_unittest.mm index 7e54581..0ccf365 100644 --- a/chrome/browser/ui/cocoa/fullscreen_window_unittest.mm +++ b/chrome/browser/ui/cocoa/fullscreen_window_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/fullscreen_window.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/gradient_button_cell.h b/chrome/browser/ui/cocoa/gradient_button_cell.h index 48929b5..67a5e1f 100644 --- a/chrome/browser/ui/cocoa/gradient_button_cell.h +++ b/chrome/browser/ui/cocoa/gradient_button_cell.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" namespace ui { class ThemeProvider; diff --git a/chrome/browser/ui/cocoa/gradient_button_cell.mm b/chrome/browser/ui/cocoa/gradient_button_cell.mm index 5d376ce..2995a8f 100644 --- a/chrome/browser/ui/cocoa/gradient_button_cell.mm +++ b/chrome/browser/ui/cocoa/gradient_button_cell.mm @@ -5,7 +5,7 @@ #include "chrome/browser/ui/cocoa/gradient_button_cell.h" #include "base/logging.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "chrome/browser/themes/theme_service.h" #import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/themed_window.h" diff --git a/chrome/browser/ui/cocoa/gradient_button_cell_unittest.mm b/chrome/browser/ui/cocoa/gradient_button_cell_unittest.mm index a9d09da..9860341 100644 --- a/chrome/browser/ui/cocoa/gradient_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/gradient_button_cell_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/gradient_button_cell.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h index 48d00b38..09cd694 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.h +++ b/chrome/browser/ui/cocoa/history_menu_bridge.h @@ -9,8 +9,8 @@ #import <Cocoa/Cocoa.h> #include <map> -#include "base/ref_counted.h" -#include "base/scoped_nsobject.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/favicon_service.h" #include "chrome/browser/history/history.h" #include "chrome/browser/sessions/session_id.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm index ee085b0..8c669b8 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm @@ -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. #import <Cocoa/Cocoa.h> #include <vector> -#include "base/ref_counted_memory.h" +#include "base/memory/ref_counted_memory.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm index cb11899..b9f6602 100644 --- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm @@ -1,10 +1,10 @@ -// 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. #import "chrome/browser/ui/cocoa/history_menu_cocoa_controller.h" -#include "base/scoped_vector.h" +#include "base/memory/scoped_vector.h" #include "chrome/app/chrome_command_ids.h" // IDC_HISTORY_MENU #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm index 7edc34b..6442576 100644 --- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm @@ -1,9 +1,9 @@ -// 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 "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/ui/cocoa/hover_button.h b/chrome/browser/ui/cocoa/hover_button.h index e411434..022c120 100644 --- a/chrome/browser/ui/cocoa/hover_button.h +++ b/chrome/browser/ui/cocoa/hover_button.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // A button that changes when you hover over it and click it. @interface HoverButton : NSButton { diff --git a/chrome/browser/ui/cocoa/hover_close_button.h b/chrome/browser/ui/cocoa/hover_close_button.h index 372582c..767da69 100644 --- a/chrome/browser/ui/cocoa/hover_close_button.h +++ b/chrome/browser/ui/cocoa/hover_close_button.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/hover_button.h" // The standard close button for our Mac UI which is the "x" that changes to a diff --git a/chrome/browser/ui/cocoa/hover_close_button.mm b/chrome/browser/ui/cocoa/hover_close_button.mm index c9d5a2d..4b04bfe 100644 --- a/chrome/browser/ui/cocoa/hover_close_button.mm +++ b/chrome/browser/ui/cocoa/hover_close_button.mm @@ -1,10 +1,10 @@ -// 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. #import "chrome/browser/ui/cocoa/hover_close_button.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "grit/generated_resources.h" #import "third_party/molokocacao/NSBezierPath+MCAdditions.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/hover_image_button.h b/chrome/browser/ui/cocoa/hover_image_button.h index 76a702d..ec63d44 100644 --- a/chrome/browser/ui/cocoa/hover_image_button.h +++ b/chrome/browser/ui/cocoa/hover_image_button.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/hover_button.h" // A button that changes images when you hover over it and click it. diff --git a/chrome/browser/ui/cocoa/hover_image_button.mm b/chrome/browser/ui/cocoa/hover_image_button.mm index a6ae41e..95352d3 100644 --- a/chrome/browser/ui/cocoa/hover_image_button.mm +++ b/chrome/browser/ui/cocoa/hover_image_button.mm @@ -1,10 +1,10 @@ -// 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. #import "chrome/browser/ui/cocoa/hover_image_button.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm b/chrome/browser/ui/cocoa/hover_image_button_unittest.mm index b34bf98b..e25dc77 100644 --- a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm +++ b/chrome/browser/ui/cocoa/hover_image_button_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/hover_image_button.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.h b/chrome/browser/ui/cocoa/html_dialog_window_controller.h index e5660da..b4d0f3e 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller.h +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.h @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" class HtmlDialogWindowDelegateBridge; diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm index 9e43291..3b2d026 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h" #include "base/logging.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/browser_dialogs.h" diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.h b/chrome/browser/ui/cocoa/hung_renderer_controller.h index 584feb8..957e5fb 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.h +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.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. @@ -21,7 +21,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" @class MultiKeyEquivalentButton; class TabContents; diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller_unittest.mm b/chrome/browser/ui/cocoa/hung_renderer_controller_unittest.mm index e03becf..7a9e6b3 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/hung_renderer_controller.h" diff --git a/chrome/browser/ui/cocoa/hyperlink_button_cell.h b/chrome/browser/ui/cocoa/hyperlink_button_cell.h index fd9ec0c..96bc73a 100644 --- a/chrome/browser/ui/cocoa/hyperlink_button_cell.h +++ b/chrome/browser/ui/cocoa/hyperlink_button_cell.h @@ -1,9 +1,9 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // A HyperlinkButtonCell is used to create an NSButton that looks and acts // like a hyperlink. The default styling is to look like blue, underlined text diff --git a/chrome/browser/ui/cocoa/hyperlink_button_cell_unittest.mm b/chrome/browser/ui/cocoa/hyperlink_button_cell_unittest.mm index 0adae14..4c1624e 100644 --- a/chrome/browser/ui/cocoa/hyperlink_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/hyperlink_button_cell_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm b/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm index aadd90f..f04261d 100644 --- a/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm @@ -4,8 +4,8 @@ #import <Cocoa/Cocoa.h> +#include "base/memory/scoped_nsobject.h" #include "base/message_loop.h" -#include "base/scoped_nsobject.h" #include "chrome/browser/importer/importer_host.h" #include "chrome/browser/importer/importer_lock_dialog.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.h b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.h index bfd9353..ad6ebbf 100644 --- a/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/importer_progress_observer.h" diff --git a/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm index 2dda0f4..6b9d609 100644 --- a/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/importer/import_progress_dialog_cocoa.mm @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/importer/importer_host.h" diff --git a/chrome/browser/ui/cocoa/info_bubble_view.mm b/chrome/browser/ui/cocoa/info_bubble_view.mm index 209857a..bc12045 100644 --- a/chrome/browser/ui/cocoa/info_bubble_view.mm +++ b/chrome/browser/ui/cocoa/info_bubble_view.mm @@ -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. #import "chrome/browser/ui/cocoa/info_bubble_view.h" #include "base/logging.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" @implementation InfoBubbleView diff --git a/chrome/browser/ui/cocoa/info_bubble_view_unittest.mm b/chrome/browser/ui/cocoa/info_bubble_view_unittest.mm index c3c438d..ff60da5 100644 --- a/chrome/browser/ui/cocoa/info_bubble_view_unittest.mm +++ b/chrome/browser/ui/cocoa/info_bubble_view_unittest.mm @@ -1,8 +1,8 @@ -// 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. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/info_bubble_window.h b/chrome/browser/ui/cocoa/info_bubble_window.h index ee91794..cf992d7 100644 --- a/chrome/browser/ui/cocoa/info_bubble_window.h +++ b/chrome/browser/ui/cocoa/info_bubble_window.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" class AppNotificationBridge; diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm index 2fafd27..dd28438 100644 --- a/chrome/browser/ui/cocoa/info_bubble_window.mm +++ b/chrome/browser/ui/cocoa/info_bubble_window.mm @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" #include "content/common/notification_service.h" diff --git a/chrome/browser/ui/cocoa/info_bubble_window_unittest.mm b/chrome/browser/ui/cocoa/info_bubble_window_unittest.mm index aed5c0a..b174af2 100644 --- a/chrome/browser/ui/cocoa/info_bubble_window_unittest.mm +++ b/chrome/browser/ui/cocoa/info_bubble_window_unittest.mm @@ -1,8 +1,8 @@ -// 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. -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/info_bubble_window.h" diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h index f9aa446..3113a34 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h +++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/view_resizer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm index bdeeb73..c05a9ae 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" #include "chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h" diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller.h b/chrome/browser/ui/cocoa/infobars/infobar_controller.h index 6214a42..847ca20 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_controller.h +++ b/chrome/browser/ui/cocoa/infobars/infobar_controller.h @@ -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. #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" @class AnimatableView; @class HoverCloseButton; diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm index b41f972..011e38b 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" diff --git a/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm b/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm index f8662a8..d53e2ab 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm @@ -4,7 +4,7 @@ #include "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/themes/theme_service.h" #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" #import "chrome/browser/ui/cocoa/themed_window.h" diff --git a/chrome/browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm b/chrome/browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm index f7a6756..da5b02b 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm @@ -1,8 +1,8 @@ -// 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. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h index 9179b04..073e60f 100644 --- a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.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. @@ -9,8 +9,8 @@ #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "base/logging.h" -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #if __OBJC__ @class NSAlert; diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h index f4001b1..aef1c8b 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.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. @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/styled_text_field.h" #import "chrome/browser/ui/cocoa/url_drop_target.h" diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm index 1bc2eee..72acb71 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h index 905bc84..b483381 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/url_drop_target.h" @class AutocompleteTextField; diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm index 8e2d347..889d948 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm @@ -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. #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "chrome/app/chrome_command_ids.h" // IDC_* #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm index 1aa65ec..62905bd 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm @@ -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. #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h index e4686b9..1d260be 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.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. @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h index 55e09be..508cbd4 100644 --- a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.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. @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #include "base/gtest_prod_util.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h" // Draws an outlined rounded rect, with an optional image to the left diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h index 0e12f39..8c3346b 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.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. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_CONTENT_SETTING_DECORATION_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/location_bar/image_decoration.h" #include "chrome/common/content_settings_types.h" diff --git a/chrome/browser/ui/cocoa/location_bar/image_decoration.h b/chrome/browser/ui/cocoa/location_bar/image_decoration.h index c0bcfbf..889144b 100644 --- a/chrome/browser/ui/cocoa/location_bar/image_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/image_decoration.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. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_IMAGE_DECORATION_H_ #pragma once -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h" // |LocationBarDecoration| which sizes and draws itself according to diff --git a/chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller_unittest.mm b/chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller_unittest.mm index 81ef513..dd1ea26 100644 --- a/chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller_unittest.mm @@ -1,9 +1,9 @@ -// 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 "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h index da8c42b..0e4e587 100644 --- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.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. @@ -10,7 +10,7 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "base/string16.h" // Draws the keyword hint, "Press [tab] to search <site>". diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 14cf022..9393a45 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.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. @@ -10,9 +10,9 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" -#include "base/scoped_vector.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/scoped_vector.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #include "chrome/browser/extensions/image_loading_tracker.h" diff --git a/chrome/browser/ui/cocoa/location_bar/omnibox_popup_view_unittest.mm b/chrome/browser/ui/cocoa/location_bar/omnibox_popup_view_unittest.mm index ac4be55..648e040 100644 --- a/chrome/browser/ui/cocoa/location_bar/omnibox_popup_view_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/omnibox_popup_view_unittest.mm @@ -1,8 +1,8 @@ -// 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. -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/location_bar/omnibox_popup_view.h" diff --git a/chrome/browser/ui/cocoa/menu_button.h b/chrome/browser/ui/cocoa/menu_button.h index b116b1f9..9b51648 100644 --- a/chrome/browser/ui/cocoa/menu_button.h +++ b/chrome/browser/ui/cocoa/menu_button.h @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h" // This a button which displays a user-provided menu "attached" below it upon diff --git a/chrome/browser/ui/cocoa/menu_button.mm b/chrome/browser/ui/cocoa/menu_button.mm index c66b8d2..07111ab 100644 --- a/chrome/browser/ui/cocoa/menu_button.mm +++ b/chrome/browser/ui/cocoa/menu_button.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/menu_button.h" #include "base/logging.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/clickhold_button_cell.h" @interface MenuButton (Private) diff --git a/chrome/browser/ui/cocoa/menu_button_unittest.mm b/chrome/browser/ui/cocoa/menu_button_unittest.mm index 8adceb4..e2d0de8 100644 --- a/chrome/browser/ui/cocoa/menu_button_unittest.mm +++ b/chrome/browser/ui/cocoa/menu_button_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/clickhold_button_cell.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/menu_button.h" diff --git a/chrome/browser/ui/cocoa/menu_controller.h b/chrome/browser/ui/cocoa/menu_controller.h index e842ac1..5aa0913 100644 --- a/chrome/browser/ui/cocoa/menu_controller.h +++ b/chrome/browser/ui/cocoa/menu_controller.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. @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" namespace ui { class MenuModel; diff --git a/chrome/browser/ui/cocoa/new_tab_button.h b/chrome/browser/ui/cocoa/new_tab_button.h index 9578cbf..623225b 100644 --- a/chrome/browser/ui/cocoa/new_tab_button.h +++ b/chrome/browser/ui/cocoa/new_tab_button.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // Overrides hit-test behavior to only accept clicks inside the image of the // button, not just inside the bounding box. This could be abstracted to general diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.h b/chrome/browser/ui/cocoa/notifications/balloon_controller.h index e346f42..f8a69ce 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.h +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.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. @@ -9,8 +9,8 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" class Balloon; @class BalloonContentViewCocoa; diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index 692cc196..094ec95 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -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. @@ -7,7 +7,7 @@ #include "app/mac/nsimage_cache.h" #import "base/mac/cocoa_protocols.h" #include "base/mac/mac_util.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/desktop_notification_service.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm index 33c24ce..35d8f7d 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view.mm b/chrome/browser/ui/cocoa/notifications/balloon_view.mm index aa78be6..fb5e87a 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_view.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_view.mm @@ -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. @@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/notifications/balloon_controller.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" diff --git a/chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm b/chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm index ecbf07d..f9d7412 100644 --- a/chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm +++ b/chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm @@ -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. @@ -8,7 +8,7 @@ #include <ostream> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/objc_method_swizzle.mm b/chrome/browser/ui/cocoa/objc_method_swizzle.mm index 34f88a5..39f3d9b 100644 --- a/chrome/browser/ui/cocoa/objc_method_swizzle.mm +++ b/chrome/browser/ui/cocoa/objc_method_swizzle.mm @@ -1,11 +1,11 @@ -// 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. #import "chrome/browser/ui/cocoa/objc_method_swizzle.h" #import "base/logging.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "chrome/app/breakpad_mac.h" namespace ObjcEvilDoers { diff --git a/chrome/browser/ui/cocoa/objc_method_swizzle_unittest.mm b/chrome/browser/ui/cocoa/objc_method_swizzle_unittest.mm index 1641741..f56043c 100644 --- a/chrome/browser/ui/cocoa/objc_method_swizzle_unittest.mm +++ b/chrome/browser/ui/cocoa/objc_method_swizzle_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import "chrome/browser/ui/cocoa/objc_method_swizzle.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "testing/gtest/include/gtest/gtest.h" @interface ObjcMethodSwizzleTest : NSObject diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller.h b/chrome/browser/ui/cocoa/page_info_bubble_controller.h index 1b21215..d1ca865 100644 --- a/chrome/browser/ui/cocoa/page_info_bubble_controller.h +++ b/chrome/browser/ui/cocoa/page_info_bubble_controller.h @@ -4,8 +4,8 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/page_info_model.h" #import "chrome/browser/ui/cocoa/base_bubble_controller.h" diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm index cc640d0..52dfce5 100644 --- a/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/repost_form_warning_mac.h b/chrome/browser/ui/cocoa/repost_form_warning_mac.h index a7ca8b2..ef1ea3a 100644 --- a/chrome/browser/ui/cocoa/repost_form_warning_mac.h +++ b/chrome/browser/ui/cocoa/repost_form_warning_mac.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/cocoa/constrained_window_mac.h" class RepostFormWarningController; diff --git a/chrome/browser/ui/cocoa/repost_form_warning_mac.mm b/chrome/browser/ui/cocoa/repost_form_warning_mac.mm index 3bcbaf1..81a2dee 100644 --- a/chrome/browser/ui/cocoa/repost_form_warning_mac.mm +++ b/chrome/browser/ui/cocoa/repost_form_warning_mac.mm @@ -1,10 +1,10 @@ -// 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/browser/ui/cocoa/repost_form_warning_mac.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/repost_form_warning_controller.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/search_engine_dialog_controller.h b/chrome/browser/ui/cocoa/search_engine_dialog_controller.h index 0cc06f2..d1abf54 100644 --- a/chrome/browser/ui/cocoa/search_engine_dialog_controller.h +++ b/chrome/browser/ui/cocoa/search_engine_dialog_controller.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. @@ -6,9 +6,9 @@ #include <vector> -#import "base/ref_counted.h" -#import "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#import "base/memory/ref_counted.h" +#import "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" class Profile; class SearchEngineDialogControllerBridge; diff --git a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm index 93e031c..248c03e 100644 --- a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm +++ b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm @@ -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. @@ -16,7 +16,7 @@ #import "base/mac/cocoa_protocols.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/sidebar_controller.h b/chrome/browser/ui/cocoa/sidebar_controller.h index 65955d5..1eb3c83 100644 --- a/chrome/browser/ui/cocoa/sidebar_controller.h +++ b/chrome/browser/ui/cocoa/sidebar_controller.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. @@ -8,7 +8,7 @@ #import <Foundation/Foundation.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" @class NSSplitView; diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm index 02dc33d..8cf855b 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm @@ -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. @@ -9,8 +9,8 @@ #include <vector> #include "base/logging.h" -#include "base/ref_counted.h" -#import "base/scoped_nsobject.h" +#include "base/memory/ref_counted.h" +#import "base/memory/scoped_nsobject.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm index 7995585..6dbffec 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm @@ -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 <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/bubble_view.h" #import "chrome/browser/ui/cocoa/browser_test_helper.h" diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h index 122aab7..3fa6150 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "chrome/browser/status_icons/status_icon.h" diff --git a/chrome/browser/ui/cocoa/styled_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/styled_text_field_cell_unittest.mm index 2df3c65..076583f 100644 --- a/chrome/browser/ui/cocoa/styled_text_field_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/styled_text_field_cell_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/styled_text_field_cell.h" #import "chrome/browser/ui/cocoa/styled_text_field_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/styled_text_field_unittest.mm b/chrome/browser/ui/cocoa/styled_text_field_unittest.mm index 6ca36bc..4b079a5 100644 --- a/chrome/browser/ui/cocoa/styled_text_field_unittest.mm +++ b/chrome/browser/ui/cocoa/styled_text_field_unittest.mm @@ -1,11 +1,11 @@ -// 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. #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/styled_text_field.h" #import "chrome/browser/ui/cocoa/styled_text_field_cell.h" #import "chrome/browser/ui/cocoa/styled_text_field_test_helper.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm index 3e5ea6f..cc1b902 100644 --- a/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm index 9c4c9b4..4067b5a 100644 --- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm @@ -1,9 +1,9 @@ -// 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. #include "base/debug/debugger.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h" #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h index 8f782af..c97083c 100644 --- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h +++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.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,7 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_VIEW_H_ #pragma once -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/base_view.h" #import <Cocoa/Cocoa.h> diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h index a327e4b..358501f 100644 --- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h +++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.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. @@ -8,7 +8,7 @@ #include <Cocoa/Cocoa.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" class TabContents; class TabContentsNotificationBridge; diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm index 7e5db3b..caea8af 100644 --- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm +++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/navigation_controller.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.h b/chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.h index e611f4c..82e9131 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.h +++ b/chrome/browser/ui/cocoa/tab_contents/web_contents_drag_source.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" @class TabContentsViewCocoa; diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drag_source.h b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.h index 9cfcba5..7e308a5 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_drag_source.h +++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.h @@ -1,12 +1,12 @@ -// 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. #import <Cocoa/Cocoa.h> #include "base/file_path.h" -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" @class TabContentsViewCocoa; diff --git a/chrome/browser/ui/cocoa/tab_view_picker_table.h b/chrome/browser/ui/cocoa/tab_view_picker_table.h index 5de51f4..070d7c8 100644 --- a/chrome/browser/ui/cocoa/tab_view_picker_table.h +++ b/chrome/browser/ui/cocoa/tab_view_picker_table.h @@ -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. #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" // TabViewPickerTable is an NSOutlineView that can be used to switch between the // NSTabViewItems of an NSTabView. To use this, just create a diff --git a/chrome/browser/ui/cocoa/tab_view_picker_table_unittest.mm b/chrome/browser/ui/cocoa/tab_view_picker_table_unittest.mm index daf1340..1abbaa3 100644 --- a/chrome/browser/ui/cocoa/tab_view_picker_table_unittest.mm +++ b/chrome/browser/ui/cocoa/tab_view_picker_table_unittest.mm @@ -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. @@ -7,7 +7,7 @@ #import "chrome/browser/ui/cocoa/tab_view_picker_table.h" #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/table_model_array_controller.h b/chrome/browser/ui/cocoa/table_model_array_controller.h index 850bf6d..e902a39 100644 --- a/chrome/browser/ui/cocoa/table_model_array_controller.h +++ b/chrome/browser/ui/cocoa/table_model_array_controller.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. @@ -9,8 +9,8 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "ui/base/models/table_model_observer.h" class RemoveRowsObserverBridge; diff --git a/chrome/browser/ui/cocoa/table_row_nsimage_cache.h b/chrome/browser/ui/cocoa/table_row_nsimage_cache.h index 254dc3e..f6713fe 100644 --- a/chrome/browser/ui/cocoa/table_row_nsimage_cache.h +++ b/chrome/browser/ui/cocoa/table_row_nsimage_cache.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" class SkBitmap; diff --git a/chrome/browser/ui/cocoa/tabpose_window.h b/chrome/browser/ui/cocoa/tabpose_window.h index 1737bf8..8f70c8e 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.h +++ b/chrome/browser/ui/cocoa/tabpose_window.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. @@ -10,9 +10,9 @@ #include "base/mac/scoped_cftyperef.h" -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" -#include "base/scoped_vector.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/scoped_vector.h" namespace tabpose { diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index 8cc9b84..dc1ed61 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -10,7 +10,7 @@ #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" -#include "base/scoped_callback_factory.h" +#include "base/memory/scoped_callback_factory.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/cocoa/tabs/side_tab_strip_view.mm b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view.mm index 80cefc1..88f06a3 100644 --- a/chrome/browser/ui/cocoa/tabs/side_tab_strip_view.mm +++ b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view.mm @@ -1,10 +1,10 @@ -// 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. #import "chrome/browser/ui/cocoa/tabs/side_tab_strip_view.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" @implementation SideTabStripView diff --git a/chrome/browser/ui/cocoa/tabs/side_tab_strip_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view_unittest.mm index 1cc5572..9c2bfd5 100644 --- a/chrome/browser/ui/cocoa/tabs/side_tab_strip_view_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/side_tab_strip_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/tabs/side_tab_strip_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm index ef49850..40d177e 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/tabs/tab_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h index 5817cc3..e822f23 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.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. @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h" #import "chrome/browser/ui/cocoa/url_drop_target.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_view.h b/chrome/browser/ui/cocoa/tabs/tab_strip_view.h index 704136e..bd7cd37 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_view.h +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_view.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/url_drop_target.h" @class NewTabButton; diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_view_unittest.mm index 349774b..d7961aa 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_view_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_view.h b/chrome/browser/ui/cocoa/tabs/tab_view.h index 9a86c20..17eb173 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_view.h +++ b/chrome/browser/ui/cocoa/tabs/tab_view.h @@ -11,7 +11,7 @@ #include <map> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/background_gradient_view.h" #import "chrome/browser/ui/cocoa/hover_close_button.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_view_unittest.mm index 548dd0f..0ad09b9 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_view_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/tabs/tab_view.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_window_controller.h b/chrome/browser/ui/cocoa/tabs/tab_window_controller.h index db4092e..27e0cd3 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_window_controller.h +++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.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. @@ -29,7 +29,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" @class FastResizeView; @class FocusTracker; diff --git a/chrome/browser/ui/cocoa/tabs/throbber_view.h b/chrome/browser/ui/cocoa/tabs/throbber_view.h index 6cbd9f8..774fd0c 100644 --- a/chrome/browser/ui/cocoa/tabs/throbber_view.h +++ b/chrome/browser/ui/cocoa/tabs/throbber_view.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. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" @protocol ThrobberDataDelegate; diff --git a/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm index 35c3511..5419e5d 100644 --- a/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "grit/app_resources.h" diff --git a/chrome/browser/ui/cocoa/task_manager_mac.h b/chrome/browser/ui/cocoa/task_manager_mac.h index 211a86d0..b0518d6 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.h +++ b/chrome/browser/ui/cocoa/task_manager_mac.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. @@ -10,7 +10,7 @@ #include <vector> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/ui/cocoa/table_row_nsimage_cache.h" diff --git a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm index f5d9b2a..753d6f1 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/compiler_specific.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/task_manager_mac.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm index 368b9a2..753f3c6 100644 --- a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm +++ b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm @@ -6,7 +6,7 @@ #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "content/common/notification_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h index 4a978b5..a72304b 100644 --- a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h +++ b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" @class MenuButton; diff --git a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm index 63bab2a..d64637f 100644 --- a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/event_utils.h" #import "chrome/browser/ui/cocoa/menu_button.h" diff --git a/chrome/browser/ui/cocoa/toolbar/reload_button.h b/chrome/browser/ui/cocoa/toolbar/reload_button.h index 3986b70..6bcebcd 100644 --- a/chrome/browser/ui/cocoa/toolbar/reload_button.h +++ b/chrome/browser/ui/cocoa/toolbar/reload_button.h @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h" // ToolbarButton subclass which defers certain state changes when the mouse diff --git a/chrome/browser/ui/cocoa/toolbar/reload_button_unittest.mm b/chrome/browser/ui/cocoa/toolbar/reload_button_unittest.mm index a7f7dd1..4a46107 100644 --- a/chrome/browser/ui/cocoa/toolbar/reload_button_unittest.mm +++ b/chrome/browser/ui/cocoa/toolbar/reload_button_unittest.mm @@ -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. @@ -6,7 +6,7 @@ #import "chrome/browser/ui/cocoa/toolbar/reload_button.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/test_event_utils.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_button_unittest.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_button_unittest.mm index 5b1a329..3322267 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_button_unittest.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_button_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/test_event_utils.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h index ef4ec76..a9c6a5e 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#include "base/scoped_ptr.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/command_observer_bridge.h" #import "chrome/browser/ui/cocoa/tracking_area.h" #import "chrome/browser/ui/cocoa/url_drop_target.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 3646a51..c681b9b 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -8,7 +8,7 @@ #include "app/mac/nsimage_cache.h" #include "base/mac/mac_util.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm index 1b778d9..efdbb76 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_view_unittest.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_view_unittest.mm index 34994d8..f6bb035 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_view_unittest.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_view_unittest.mm @@ -1,8 +1,8 @@ -// 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. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/tracking_area.h b/chrome/browser/ui/cocoa/tracking_area.h index f63be3a..a32ca03 100644 --- a/chrome/browser/ui/cocoa/tracking_area.h +++ b/chrome/browser/ui/cocoa/tracking_area.h @@ -7,7 +7,7 @@ #import <AppKit/AppKit.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" @class CrTrackingAreaOwnerProxy; diff --git a/chrome/browser/ui/cocoa/tracking_area_unittest.mm b/chrome/browser/ui/cocoa/tracking_area_unittest.mm index a812f46..a3ebae8 100644 --- a/chrome/browser/ui/cocoa/tracking_area_unittest.mm +++ b/chrome/browser/ui/cocoa/tracking_area_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/objc_zombie.h" #import "chrome/browser/ui/cocoa/tracking_area.h" diff --git a/chrome/browser/ui/cocoa/translate/translate_infobar_base.h b/chrome/browser/ui/cocoa/translate/translate_infobar_base.h index 66612eb..bd51124 100644 --- a/chrome/browser/ui/cocoa/translate/translate_infobar_base.h +++ b/chrome/browser/ui/cocoa/translate/translate_infobar_base.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. @@ -10,8 +10,8 @@ #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" #import "base/mac/cocoa_protocols.h" -#import "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" +#import "base/memory/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/translate/languages_menu_model.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_delegate.h" diff --git a/chrome/browser/ui/cocoa/translate/translate_infobar_unittest.mm b/chrome/browser/ui/cocoa/translate/translate_infobar_unittest.mm index 3580973..09ad581 100644 --- a/chrome/browser/ui/cocoa/translate/translate_infobar_unittest.mm +++ b/chrome/browser/ui/cocoa/translate/translate_infobar_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#import "base/scoped_nsobject.h" +#import "base/memory/scoped_nsobject.h" #import "base/string_util.h" #include "base/utf_string_conversions.h" #import "chrome/app/chrome_command_ids.h" // For translate menu command ids. diff --git a/chrome/browser/ui/cocoa/vertical_gradient_view.h b/chrome/browser/ui/cocoa/vertical_gradient_view.h index 98a3a2b..2cce1be 100644 --- a/chrome/browser/ui/cocoa/vertical_gradient_view.h +++ b/chrome/browser/ui/cocoa/vertical_gradient_view.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. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_VERTICAL_GRADIENT_VIEW_H_ #pragma once -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import <Cocoa/Cocoa.h> diff --git a/chrome/browser/ui/cocoa/vertical_gradient_view_unittest.mm b/chrome/browser/ui/cocoa/vertical_gradient_view_unittest.mm index e574a69..ac046b0 100644 --- a/chrome/browser/ui/cocoa/vertical_gradient_view_unittest.mm +++ b/chrome/browser/ui/cocoa/vertical_gradient_view_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" diff --git a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm index 3b95440..09b13f5 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm @@ -6,7 +6,7 @@ #import "chrome/browser/ui/cocoa/window_size_autosaver.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm index 16a529a..7b3e511 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm index a853824..99932b9 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm @@ -1,10 +1,10 @@ -// 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. #import <Cocoa/Cocoa.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm index d042989..ebc8e83 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm @@ -1,10 +1,10 @@ -// 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. #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" @implementation WrenchMenuButtonCell diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm index fc9e403..ae57132 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h index ec68120..b1051a2 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.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. @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/menu_controller.h" @class MenuTrackedRootView; diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm index 62a2475..3451179 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm @@ -1,8 +1,8 @@ -// 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 "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" |