| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 class TestingOmniboxEditController : public ChromeOmniboxEditController { | 86 class TestingOmniboxEditController : public ChromeOmniboxEditController { |
| 87 public: | 87 public: |
| 88 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) | 88 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) |
| 89 : ChromeOmniboxEditController(NULL), toolbar_model_(toolbar_model) {} | 89 : ChromeOmniboxEditController(NULL), toolbar_model_(toolbar_model) {} |
| 90 ~TestingOmniboxEditController() override {} | 90 ~TestingOmniboxEditController() override {} |
| 91 | 91 |
| 92 protected: | 92 protected: |
| 93 // Overridden from ChromeOmniboxEditController: | 93 // Overridden from ChromeOmniboxEditController: |
| 94 void UpdateWithoutTabRestore() override {} | 94 void UpdateWithoutTabRestore() override {} |
| 95 void OnChanged() override {} | 95 void OnChanged() override {} |
| 96 void ShowURL() override {} | |
| 97 ToolbarModel* GetToolbarModel() override { return toolbar_model_; } | 96 ToolbarModel* GetToolbarModel() override { return toolbar_model_; } |
| 98 const ToolbarModel* GetToolbarModel() const override { | 97 const ToolbarModel* GetToolbarModel() const override { |
| 99 return toolbar_model_; | 98 return toolbar_model_; |
| 100 } | 99 } |
| 101 content::WebContents* GetWebContents() override { return nullptr; } | 100 content::WebContents* GetWebContents() override { return nullptr; } |
| 102 | 101 |
| 103 private: | 102 private: |
| 104 ToolbarModel* toolbar_model_; | 103 ToolbarModel* toolbar_model_; |
| 105 | 104 |
| 106 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); | 105 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 | 198 |
| 200 // With popup open verify that pressing up and down arrow works. | 199 // With popup open verify that pressing up and down arrow works. |
| 201 popup_view.set_is_open(true); | 200 popup_view.set_is_open(true); |
| 202 model->set_up_or_down_count(0); | 201 model->set_up_or_down_count(0); |
| 203 view.OnDoCommandBySelector(@selector(moveDown:)); | 202 view.OnDoCommandBySelector(@selector(moveDown:)); |
| 204 EXPECT_EQ(1, model->up_or_down_count()); | 203 EXPECT_EQ(1, model->up_or_down_count()); |
| 205 model->set_up_or_down_count(0); | 204 model->set_up_or_down_count(0); |
| 206 view.OnDoCommandBySelector(@selector(moveUp:)); | 205 view.OnDoCommandBySelector(@selector(moveUp:)); |
| 207 EXPECT_EQ(-1, model->up_or_down_count()); | 206 EXPECT_EQ(-1, model->up_or_down_count()); |
| 208 } | 207 } |
| OLD | NEW |