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

Side by Side Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm

Issue 823133004: Cleanup: Update the path to gfx rect headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rect_f.h Created 5 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
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 "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h" 5 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 10 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
11 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 11 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "ui/gfx/font_list.h" 13 #include "ui/gfx/font_list.h"
14 #include "ui/gfx/rect.h" 14 #include "ui/gfx/geometry/rect.h"
15 #include "ui/gfx/text_elider.h" 15 #include "ui/gfx/text_elider.h"
16 16
17 namespace { 17 namespace {
18 18
19 class MockOmniboxPopupViewMac : public OmniboxPopupViewMac { 19 class MockOmniboxPopupViewMac : public OmniboxPopupViewMac {
20 public: 20 public:
21 MockOmniboxPopupViewMac(OmniboxView* omnibox_view, 21 MockOmniboxPopupViewMac(OmniboxView* omnibox_view,
22 OmniboxEditModel* edit_model, 22 OmniboxEditModel* edit_model,
23 NSTextField* field) 23 NSTextField* field)
24 : OmniboxPopupViewMac(omnibox_view, edit_model, field) { 24 : OmniboxPopupViewMac(omnibox_view, edit_model, field) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 EXPECT_GT(popup_view.GetTargetBounds().height(), old_height); 70 EXPECT_GT(popup_view.GetTargetBounds().height(), old_height);
71 EXPECT_EQ(5, [popup_view.matrix() numberOfRows]); 71 EXPECT_EQ(5, [popup_view.matrix() numberOfRows]);
72 72
73 popup_view.SetResultCount(0); 73 popup_view.SetResultCount(0);
74 popup_view.UpdatePopupAppearance(); 74 popup_view.UpdatePopupAppearance();
75 EXPECT_FALSE(popup_view.IsOpen()); 75 EXPECT_FALSE(popup_view.IsOpen());
76 EXPECT_EQ(0, [popup_view.matrix() numberOfRows]); 76 EXPECT_EQ(0, [popup_view.matrix() numberOfRows]);
77 } 77 }
78 78
79 } // namespace 79 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698