| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 DISALLOW_COPY_AND_ASSIGN(MockOmniboxPopupView); | 62 DISALLOW_COPY_AND_ASSIGN(MockOmniboxPopupView); |
| 63 }; | 63 }; |
| 64 | 64 |
| 65 class TestingToolbarModelDelegate : public ToolbarModelDelegate { | 65 class TestingToolbarModelDelegate : public ToolbarModelDelegate { |
| 66 public: | 66 public: |
| 67 TestingToolbarModelDelegate() {} | 67 TestingToolbarModelDelegate() {} |
| 68 ~TestingToolbarModelDelegate() override {} | 68 ~TestingToolbarModelDelegate() override {} |
| 69 | 69 |
| 70 // Overridden from ToolbarModelDelegate: | 70 // Overridden from ToolbarModelDelegate: |
| 71 content::WebContents* GetActiveWebContents() const override { return NULL; } | 71 content::WebContents* GetActiveWebContents() const override { return NULL; } |
| 72 bool InTabbedBrowser() const override { return true; } | |
| 73 | 72 |
| 74 private: | 73 private: |
| 75 DISALLOW_COPY_AND_ASSIGN(TestingToolbarModelDelegate); | 74 DISALLOW_COPY_AND_ASSIGN(TestingToolbarModelDelegate); |
| 76 }; | 75 }; |
| 77 | 76 |
| 78 class TestingOmniboxEditController : public OmniboxEditController { | 77 class TestingOmniboxEditController : public OmniboxEditController { |
| 79 public: | 78 public: |
| 80 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) | 79 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) |
| 81 : OmniboxEditController(NULL), | 80 : OmniboxEditController(NULL), |
| 82 toolbar_model_(toolbar_model) { | 81 toolbar_model_(toolbar_model) { |
| 83 } | 82 } |
| 84 ~TestingOmniboxEditController() override {} | 83 ~TestingOmniboxEditController() override {} |
| 85 | 84 |
| 86 protected: | 85 protected: |
| 87 // Overridden from OmniboxEditController: | 86 // Overridden from OmniboxEditController: |
| 88 void Update(const content::WebContents* contents) override {} | 87 void Update(const content::WebContents* contents) override {} |
| 89 void OnChanged() override {} | 88 void OnChanged() override {} |
| 90 void OnSetFocus() override {} | 89 void OnSetFocus() override {} |
| 91 void ShowURL() override {} | 90 void ShowURL() override {} |
| 92 void HideURL() override {} | |
| 93 void EndOriginChipAnimations(bool cancel_fade) override {} | |
| 94 InstantController* GetInstant() override { return NULL; } | 91 InstantController* GetInstant() override { return NULL; } |
| 95 content::WebContents* GetWebContents() override { return NULL; } | 92 content::WebContents* GetWebContents() override { return NULL; } |
| 96 ToolbarModel* GetToolbarModel() override { return toolbar_model_; } | 93 ToolbarModel* GetToolbarModel() override { return toolbar_model_; } |
| 97 const ToolbarModel* GetToolbarModel() const override { | 94 const ToolbarModel* GetToolbarModel() const override { |
| 98 return toolbar_model_; | 95 return toolbar_model_; |
| 99 } | 96 } |
| 100 | 97 |
| 101 private: | 98 private: |
| 102 ToolbarModel* toolbar_model_; | 99 ToolbarModel* toolbar_model_; |
| 103 | 100 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 | 191 |
| 195 // With popup open verify that pressing up and down arrow works. | 192 // With popup open verify that pressing up and down arrow works. |
| 196 popup_view.set_is_open(true); | 193 popup_view.set_is_open(true); |
| 197 model->set_up_or_down_count(0); | 194 model->set_up_or_down_count(0); |
| 198 view.OnDoCommandBySelector(@selector(moveDown:)); | 195 view.OnDoCommandBySelector(@selector(moveDown:)); |
| 199 EXPECT_EQ(1, model->up_or_down_count()); | 196 EXPECT_EQ(1, model->up_or_down_count()); |
| 200 model->set_up_or_down_count(0); | 197 model->set_up_or_down_count(0); |
| 201 view.OnDoCommandBySelector(@selector(moveUp:)); | 198 view.OnDoCommandBySelector(@selector(moveUp:)); |
| 202 EXPECT_EQ(-1, model->up_or_down_count()); | 199 EXPECT_EQ(-1, model->up_or_down_count()); |
| 203 } | 200 } |
| OLD | NEW |