Chromium Code Reviews| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 85 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) | 85 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) |
| 86 : OmniboxEditController(NULL), | 86 : OmniboxEditController(NULL), |
| 87 toolbar_model_(toolbar_model) { | 87 toolbar_model_(toolbar_model) { |
| 88 } | 88 } |
| 89 virtual ~TestingOmniboxEditController() {} | 89 virtual ~TestingOmniboxEditController() {} |
| 90 | 90 |
| 91 // Overridden from OmniboxEditController: | 91 // Overridden from OmniboxEditController: |
| 92 virtual void Update(const content::WebContents* contents) OVERRIDE {} | 92 virtual void Update(const content::WebContents* contents) OVERRIDE {} |
| 93 virtual void OnChanged() OVERRIDE {} | 93 virtual void OnChanged() OVERRIDE {} |
| 94 virtual void OnSetFocus() OVERRIDE {} | 94 virtual void OnSetFocus() OVERRIDE {} |
| 95 virtual void ShowURL() OVERRIDE {} | |
| 95 virtual InstantController* GetInstant() OVERRIDE { return NULL; } | 96 virtual InstantController* GetInstant() OVERRIDE { return NULL; } |
| 96 virtual content::WebContents* GetWebContents() OVERRIDE { return NULL; } | 97 virtual content::WebContents* GetWebContents() OVERRIDE { return NULL; } |
| 97 virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; } | 98 virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; } |
| 98 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE { | 99 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE { |
| 99 return toolbar_model_; | 100 return toolbar_model_; |
| 100 } | 101 } |
| 101 | 102 |
| 103 protected: | |
| 104 // Overridden from OmniboxEditController: | |
|
groby-ooo-7-16
2014/03/20 23:38:53
Any chance to make all of the overrides protected?
Justin Donnelly
2014/03/21 21:15:57
Done.
| |
| 105 virtual void HideURLAndShowOriginChip() OVERRIDE {} | |
| 106 | |
| 102 private: | 107 private: |
| 103 ToolbarModel* toolbar_model_; | 108 ToolbarModel* toolbar_model_; |
| 104 | 109 |
| 105 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); | 110 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); |
| 106 }; | 111 }; |
| 107 | 112 |
| 108 } // namespace | 113 } // namespace |
| 109 | 114 |
| 110 class OmniboxViewMacTest : public CocoaProfileTest { | 115 class OmniboxViewMacTest : public CocoaProfileTest { |
| 111 public: | 116 public: |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 | 200 |
| 196 // With popup open verify that pressing up and down arrow works. | 201 // With popup open verify that pressing up and down arrow works. |
| 197 popup_view.set_is_open(true); | 202 popup_view.set_is_open(true); |
| 198 model->set_up_or_down_count(0); | 203 model->set_up_or_down_count(0); |
| 199 view.OnDoCommandBySelector(@selector(moveDown:)); | 204 view.OnDoCommandBySelector(@selector(moveDown:)); |
| 200 EXPECT_EQ(1, model->up_or_down_count()); | 205 EXPECT_EQ(1, model->up_or_down_count()); |
| 201 model->set_up_or_down_count(0); | 206 model->set_up_or_down_count(0); |
| 202 view.OnDoCommandBySelector(@selector(moveUp:)); | 207 view.OnDoCommandBySelector(@selector(moveUp:)); |
| 203 EXPECT_EQ(-1, model->up_or_down_count()); | 208 EXPECT_EQ(-1, model->up_or_down_count()); |
| 204 } | 209 } |
| OLD | NEW |