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/omnibox/omnibox_view_mac.h" | 5 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
6 | 6 |
7 #include "chrome/browser/search/search.h" | 7 #include "chrome/browser/search/search.h" |
8 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 8 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
9 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" | 9 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" |
10 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 10 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
11 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 11 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" |
12 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" | 12 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" |
13 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" | 13 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" |
14 #include "testing/platform_test.h" | 14 #include "testing/platform_test.h" |
15 #include "ui/gfx/image/image.h" | 15 #include "ui/gfx/image/image.h" |
16 #include "ui/gfx/rect.h" | |
17 | 16 |
18 namespace { | 17 namespace { |
19 | 18 |
20 class MockOmniboxEditModel : public OmniboxEditModel { | 19 class MockOmniboxEditModel : public OmniboxEditModel { |
21 public: | 20 public: |
22 MockOmniboxEditModel(OmniboxView* view, | 21 MockOmniboxEditModel(OmniboxView* view, |
23 OmniboxEditController* controller, | 22 OmniboxEditController* controller, |
24 Profile* profile) | 23 Profile* profile) |
25 : OmniboxEditModel(view, controller, profile), | 24 : OmniboxEditModel(view, controller, profile), |
26 up_or_down_count_(0) { | 25 up_or_down_count_(0) { |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 virtual void OnSelectionBoundsChanged() OVERRIDE {} | 90 virtual void OnSelectionBoundsChanged() OVERRIDE {} |
92 virtual void OnInputInProgress(bool in_progress) OVERRIDE {} | 91 virtual void OnInputInProgress(bool in_progress) OVERRIDE {} |
93 virtual void OnKillFocus() OVERRIDE {} | 92 virtual void OnKillFocus() OVERRIDE {} |
94 virtual void OnSetFocus() OVERRIDE {} | 93 virtual void OnSetFocus() OVERRIDE {} |
95 virtual gfx::Image GetFavicon() const OVERRIDE { return gfx::Image(); } | 94 virtual gfx::Image GetFavicon() const OVERRIDE { return gfx::Image(); } |
96 virtual string16 GetTitle() const OVERRIDE { return string16(); } | 95 virtual string16 GetTitle() const OVERRIDE { return string16(); } |
97 virtual InstantController* GetInstant() OVERRIDE { return NULL; } | 96 virtual InstantController* GetInstant() OVERRIDE { return NULL; } |
98 virtual content::WebContents* GetWebContents() const OVERRIDE { | 97 virtual content::WebContents* GetWebContents() const OVERRIDE { |
99 return NULL; | 98 return NULL; |
100 } | 99 } |
101 virtual gfx::Rect GetOmniboxBounds() const OVERRIDE { return gfx::Rect(); } | |
102 | 100 |
103 private: | 101 private: |
104 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); | 102 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); |
105 }; | 103 }; |
106 | 104 |
107 } // namespace | 105 } // namespace |
108 | 106 |
109 class OmniboxViewMacTest : public CocoaProfileTest { | 107 class OmniboxViewMacTest : public CocoaProfileTest { |
110 public: | 108 public: |
111 void SetModel(OmniboxViewMac* view, OmniboxEditModel* model) { | 109 void SetModel(OmniboxViewMac* view, OmniboxEditModel* model) { |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 | 193 |
196 // With popup open verify that pressing up and down arrow works. | 194 // With popup open verify that pressing up and down arrow works. |
197 popup_view.set_is_open(true); | 195 popup_view.set_is_open(true); |
198 model->set_up_or_down_count(0); | 196 model->set_up_or_down_count(0); |
199 view.OnDoCommandBySelector(@selector(moveDown:)); | 197 view.OnDoCommandBySelector(@selector(moveDown:)); |
200 EXPECT_EQ(1, model->up_or_down_count()); | 198 EXPECT_EQ(1, model->up_or_down_count()); |
201 model->set_up_or_down_count(0); | 199 model->set_up_or_down_count(0); |
202 view.OnDoCommandBySelector(@selector(moveUp:)); | 200 view.OnDoCommandBySelector(@selector(moveUp:)); |
203 EXPECT_EQ(-1, model->up_or_down_count()); | 201 EXPECT_EQ(-1, model->up_or_down_count()); |
204 } | 202 } |
OLD | NEW |