| 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 class TestingOmniboxEditController : public OmniboxEditController { | 84 class TestingOmniboxEditController : public OmniboxEditController { |
| 85 public: | 85 public: |
| 86 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) | 86 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) |
| 87 : OmniboxEditController(NULL), | 87 : OmniboxEditController(NULL), |
| 88 toolbar_model_(toolbar_model) { | 88 toolbar_model_(toolbar_model) { |
| 89 } | 89 } |
| 90 virtual ~TestingOmniboxEditController() {} | 90 virtual ~TestingOmniboxEditController() {} |
| 91 | 91 |
| 92 protected: |
| 92 // Overridden from OmniboxEditController: | 93 // Overridden from OmniboxEditController: |
| 93 virtual void Update(const content::WebContents* contents) OVERRIDE {} | 94 virtual void Update(const content::WebContents* contents) OVERRIDE {} |
| 94 virtual void OnChanged() OVERRIDE {} | 95 virtual void OnChanged() OVERRIDE {} |
| 95 virtual void OnSetFocus() OVERRIDE {} | 96 virtual void OnSetFocus() OVERRIDE {} |
| 97 virtual void ShowURL() OVERRIDE {} |
| 98 virtual void HideURL() OVERRIDE {} |
| 96 virtual InstantController* GetInstant() OVERRIDE { return NULL; } | 99 virtual InstantController* GetInstant() OVERRIDE { return NULL; } |
| 97 virtual content::WebContents* GetWebContents() OVERRIDE { return NULL; } | 100 virtual content::WebContents* GetWebContents() OVERRIDE { return NULL; } |
| 98 virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; } | 101 virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; } |
| 99 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE { | 102 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE { |
| 100 return toolbar_model_; | 103 return toolbar_model_; |
| 101 } | 104 } |
| 102 | 105 |
| 103 private: | 106 private: |
| 104 ToolbarModel* toolbar_model_; | 107 ToolbarModel* toolbar_model_; |
| 105 | 108 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 | 199 |
| 197 // With popup open verify that pressing up and down arrow works. | 200 // With popup open verify that pressing up and down arrow works. |
| 198 popup_view.set_is_open(true); | 201 popup_view.set_is_open(true); |
| 199 model->set_up_or_down_count(0); | 202 model->set_up_or_down_count(0); |
| 200 view.OnDoCommandBySelector(@selector(moveDown:)); | 203 view.OnDoCommandBySelector(@selector(moveDown:)); |
| 201 EXPECT_EQ(1, model->up_or_down_count()); | 204 EXPECT_EQ(1, model->up_or_down_count()); |
| 202 model->set_up_or_down_count(0); | 205 model->set_up_or_down_count(0); |
| 203 view.OnDoCommandBySelector(@selector(moveUp:)); | 206 view.OnDoCommandBySelector(@selector(moveUp:)); |
| 204 EXPECT_EQ(-1, model->up_or_down_count()); | 207 EXPECT_EQ(-1, model->up_or_down_count()); |
| 205 } | 208 } |
| OLD | NEW |