diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 22:51:46 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 22:51:46 +0000 |
commit | a852203c1ae878c97ef5f64eec9b89e57642a78b (patch) | |
tree | 8d2e4837f0bd6f9300a0fe2d17c0956181e39bbf /chrome/browser/app_controller_mac_unittest.mm | |
parent | dd9cd303480e5c1fd2465986903856651bded8d5 (diff) | |
download | chromium_src-a852203c1ae878c97ef5f64eec9b89e57642a78b.zip chromium_src-a852203c1ae878c97ef5f64eec9b89e57642a78b.tar.gz chromium_src-a852203c1ae878c97ef5f64eec9b89e57642a78b.tar.bz2 |
mac: Update clients of scoped_nsobject.h.
1.) The header is now in base/mac instead of base/memory
2.) The class is now in namespace base.
This CL was created programmatically by running:
1.)
git grep -l memory/scoped_nsobject.h | xargs sed -i -e 's/memory\/scoped_nsobject.h/mac\/scoped_nsobject.h/g'
for f in $(git diff --name-only origin); do tools/sort-headers.py $f -f; done
git commit -a -m headers
# manually undo changes to gypi file
git cl upload # patch set 1
2.)
git grep -l 'scoped_nsobject<' | xargs sed -i -e 's/scoped_nsobject</base::scoped_nsobject</g'
# manually undo comment changes in scoped_nsobject.h, tracking_area.h
git commit -a -m format
git cl upload # patch set 2
# Manually audit all files, file bugs and clean up bad clang-format decisions
git cl upload # patch set 3
BUG=251957
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/17593006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac_unittest.mm')
-rw-r--r-- | chrome/browser/app_controller_mac_unittest.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/app_controller_mac_unittest.mm b/chrome/browser/app_controller_mac_unittest.mm index b391fd7..a17c76d 100644 --- a/chrome/browser/app_controller_mac_unittest.mm +++ b/chrome/browser/app_controller_mac_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/memory/scoped_nsobject.h" +#include "base/mac/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" #include "testing/platform_test.h" @@ -13,7 +13,7 @@ class AppControllerTest : public PlatformTest { }; TEST_F(AppControllerTest, DockMenu) { - scoped_nsobject<AppController> ac([[AppController alloc] init]); + base::scoped_nsobject<AppController> ac([[AppController alloc] init]); NSMenu* menu = [ac applicationDockMenu:NSApp]; NSMenuItem* item; |