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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/resource_bundle.h"
8 #import "base/mac/cocoa_protocols.h" 7 #import "base/mac/cocoa_protocols.h"
9 #include "base/scoped_nsobject.h" 8 #include "base/scoped_nsobject.h"
10 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" 9 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
11 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" 10 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
12 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" 11 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
13 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_h elper.h" 12 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_h elper.h"
14 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h" 13 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
15 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 14 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
16 #include "grit/theme_resources.h" 15 #include "grit/theme_resources.h"
17 #include "testing/gmock/include/gmock/gmock.h" 16 #include "testing/gmock/include/gmock/gmock.h"
18 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
19 #import "testing/gtest_mac.h" 18 #import "testing/gtest_mac.h"
20 #include "testing/platform_test.h" 19 #include "testing/platform_test.h"
20 #include "ui/base/resource/resource_bundle.h"
21 21
22 using ::testing::A; 22 using ::testing::A;
23 using ::testing::InSequence; 23 using ::testing::InSequence;
24 using ::testing::Return; 24 using ::testing::Return;
25 using ::testing::ReturnArg; 25 using ::testing::ReturnArg;
26 using ::testing::StrictMock; 26 using ::testing::StrictMock;
27 using ::testing::_; 27 using ::testing::_;
28 28
29 namespace { 29 namespace {
30 30
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 scoped_nsobject<AutocompleteTextField> pin([field_ retain]); 783 scoped_nsobject<AutocompleteTextField> pin([field_ retain]);
784 [field_ removeFromSuperview]; 784 [field_ removeFromSuperview];
785 [test_window() resignKeyWindow]; 785 [test_window() resignKeyWindow];
786 786
787 [[test_window() contentView] addSubview:field_]; 787 [[test_window() contentView] addSubview:field_];
788 EXPECT_CALL(field_observer_, ClosePopup()); 788 EXPECT_CALL(field_observer_, ClosePopup());
789 [test_window() resignKeyWindow]; 789 [test_window() resignKeyWindow];
790 } 790 }
791 791
792 } // namespace 792 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698