chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm - Issue 10656014: Merge 143605 - grd file update for new 2x assets

Side by Side Diff: chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm

Issue 10656014: Merge 143605 - grd file update for new 2x assets (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/

Patch Set: Created 8 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

« no previous file with comments | « chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm ('k') | chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"	5 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"

6	6

7 #include "base/memory/scoped_nsobject.h"	7 #include "base/memory/scoped_nsobject.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/search_engines/template_url.h"	9 #include "chrome/browser/search_engines/template_url.h"

10 #include "chrome/browser/search_engines/template_url_service_factory.h"	10 #include "chrome/browser/search_engines/template_url_service_factory.h"

11 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"	11 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"

12 #include "chrome/test/base/testing_profile.h"	12 #include "chrome/test/base/testing_profile.h"

13 #include "grit/generated_resources.h"	13 #include "grit/generated_resources.h"

14 #include "grit/theme_resources.h"	14 #include "grit/theme_resources_standard.h"

15 #include "grit/ui_resources.h"	15 #include "grit/ui_resources.h"

16 #include "testing/gtest/include/gtest/gtest.h"	16 #include "testing/gtest/include/gtest/gtest.h"

17 #import "testing/gtest_mac.h"	17 #import "testing/gtest_mac.h"

18 #include "testing/platform_test.h"	18 #include "testing/platform_test.h"

19 #include "ui/base/l10n/l10n_util_mac.h"	19 #include "ui/base/l10n/l10n_util_mac.h"

20 #include "ui/base/resource/resource_bundle.h"	20 #include "ui/base/resource/resource_bundle.h"

21 #include "ui/gfx/image/image.h"	21 #include "ui/gfx/image/image.h"

22	22

23 @interface FakeEditSearchEngineController : EditSearchEngineCocoaController	23 @interface FakeEditSearchEngineController : EditSearchEngineCocoaController

24 @property(nonatomic, readonly) NSTextField* nameField;	24 @property(nonatomic, readonly) NSTextField* nameField;

(...skipping 202 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
227 EXPECT_NSEQ(@"Foobar", nameString);	227 EXPECT_NSEQ(@"Foobar", nameString);

228 NSString* keywordString = [[controller keywordField] stringValue];	228 NSString* keywordString = [[controller keywordField] stringValue];

229 EXPECT_NSEQ(@"keyword", keywordString);	229 EXPECT_NSEQ(@"keyword", keywordString);

230 NSString* urlValueString = [[controller urlField] stringValue];	230 NSString* urlValueString = [[controller urlField] stringValue];

231 EXPECT_NSEQ(@"http://foo-bar.com", urlValueString);	231 EXPECT_NSEQ(@"http://foo-bar.com", urlValueString);

232 EXPECT_TRUE([controller validateFields]);	232 EXPECT_TRUE([controller validateFields]);

233 [controller close];	233 [controller close];

234 }	234 }

235	235

236 } // namespace	236 } // namespace

OLD	NEW