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/ui/cocoa/cocoa_profile_test.h" | 7 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
8 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" | 8 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" |
9 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 9 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
10 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 10 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 } | 89 } |
90 virtual ~TestingOmniboxEditController() {} | 90 virtual ~TestingOmniboxEditController() {} |
91 | 91 |
92 protected: | 92 protected: |
93 // Overridden from OmniboxEditController: | 93 // Overridden from OmniboxEditController: |
94 virtual void Update(const content::WebContents* contents) OVERRIDE {} | 94 virtual void Update(const content::WebContents* contents) OVERRIDE {} |
95 virtual void OnChanged() OVERRIDE {} | 95 virtual void OnChanged() OVERRIDE {} |
96 virtual void OnSetFocus() OVERRIDE {} | 96 virtual void OnSetFocus() OVERRIDE {} |
97 virtual void ShowURL() OVERRIDE {} | 97 virtual void ShowURL() OVERRIDE {} |
98 virtual void HideURL() OVERRIDE {} | 98 virtual void HideURL() OVERRIDE {} |
| 99 virtual void EndOriginChipAnimations() OVERRIDE {} |
99 virtual InstantController* GetInstant() OVERRIDE { return NULL; } | 100 virtual InstantController* GetInstant() OVERRIDE { return NULL; } |
100 virtual content::WebContents* GetWebContents() OVERRIDE { return NULL; } | 101 virtual content::WebContents* GetWebContents() OVERRIDE { return NULL; } |
101 virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; } | 102 virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; } |
102 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE { | 103 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE { |
103 return toolbar_model_; | 104 return toolbar_model_; |
104 } | 105 } |
105 | 106 |
106 private: | 107 private: |
107 ToolbarModel* toolbar_model_; | 108 ToolbarModel* toolbar_model_; |
108 | 109 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 | 200 |
200 // With popup open verify that pressing up and down arrow works. | 201 // With popup open verify that pressing up and down arrow works. |
201 popup_view.set_is_open(true); | 202 popup_view.set_is_open(true); |
202 model->set_up_or_down_count(0); | 203 model->set_up_or_down_count(0); |
203 view.OnDoCommandBySelector(@selector(moveDown:)); | 204 view.OnDoCommandBySelector(@selector(moveDown:)); |
204 EXPECT_EQ(1, model->up_or_down_count()); | 205 EXPECT_EQ(1, model->up_or_down_count()); |
205 model->set_up_or_down_count(0); | 206 model->set_up_or_down_count(0); |
206 view.OnDoCommandBySelector(@selector(moveUp:)); | 207 view.OnDoCommandBySelector(@selector(moveUp:)); |
207 EXPECT_EQ(-1, model->up_or_down_count()); | 208 EXPECT_EQ(-1, model->up_or_down_count()); |
208 } | 209 } |
OLD | NEW |