Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/memory/scoped_nsobject.h" 7 #include "base/mac/scoped_nsobject.h"
8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
9 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" 9 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "testing/platform_test.h" 12 #include "testing/platform_test.h"
13 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
14 #include "ui/gfx/image/image.h" 14 #include "ui/gfx/image/image.h"
15 15
16 namespace { 16 namespace {
17 17
18 class ThrobberViewTest : public CocoaTest { 18 class ThrobberViewTest : public CocoaTest {
19 public: 19 public:
20 ThrobberViewTest() { 20 ThrobberViewTest() {
21 NSRect frame = NSMakeRect(10, 10, 16, 16); 21 NSRect frame = NSMakeRect(10, 10, 16, 16);
22 NSImage* image = ResourceBundle::GetSharedInstance().GetNativeImageNamed( 22 NSImage* image = ResourceBundle::GetSharedInstance().GetNativeImageNamed(
23 IDR_THROBBER).ToNSImage(); 23 IDR_THROBBER).ToNSImage();
24 view_ = [ThrobberView filmstripThrobberViewWithFrame:frame image:image]; 24 view_ = [ThrobberView filmstripThrobberViewWithFrame:frame image:image];
25 [[test_window() contentView] addSubview:view_]; 25 [[test_window() contentView] addSubview:view_];
26 } 26 }
27 27
28 ThrobberView* view_; 28 ThrobberView* view_;
29 }; 29 };
30 30
31 TEST_VIEW(ThrobberViewTest, view_) 31 TEST_VIEW(ThrobberViewTest, view_)
32 32
33 } // namespace 33 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698