| 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 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 103 |
| 104 class TestingOmniboxEditController : public OmniboxEditController { | 104 class TestingOmniboxEditController : public OmniboxEditController { |
| 105 public: | 105 public: |
| 106 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) | 106 explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) |
| 107 : toolbar_model_(toolbar_model) {} | 107 : toolbar_model_(toolbar_model) {} |
| 108 | 108 |
| 109 protected: | 109 protected: |
| 110 // OmniboxEditController: | 110 // OmniboxEditController: |
| 111 void OnInputInProgress(bool in_progress) override {} | 111 void OnInputInProgress(bool in_progress) override {} |
| 112 void OnChanged() override {} | 112 void OnChanged() override {} |
| 113 void ShowURL() override {} | |
| 114 ToolbarModel* GetToolbarModel() override { return toolbar_model_; } | 113 ToolbarModel* GetToolbarModel() override { return toolbar_model_; } |
| 115 const ToolbarModel* GetToolbarModel() const override { | 114 const ToolbarModel* GetToolbarModel() const override { |
| 116 return toolbar_model_; | 115 return toolbar_model_; |
| 117 } | 116 } |
| 118 | 117 |
| 119 private: | 118 private: |
| 120 ToolbarModel* toolbar_model_; | 119 ToolbarModel* toolbar_model_; |
| 121 | 120 |
| 122 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); | 121 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); |
| 123 }; | 122 }; |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 alternate_nav_url, base::string16(), 0); | 386 alternate_nav_url, base::string16(), 0); |
| 388 EXPECT_TRUE(AutocompleteInput::HasHTTPScheme( | 387 EXPECT_TRUE(AutocompleteInput::HasHTTPScheme( |
| 389 client->alternate_nav_match().fill_into_edit)); | 388 client->alternate_nav_match().fill_into_edit)); |
| 390 | 389 |
| 391 model()->SetUserText(base::ASCIIToUTF16("ab cd")); | 390 model()->SetUserText(base::ASCIIToUTF16("ab cd")); |
| 392 model()->OpenMatch(match, WindowOpenDisposition::CURRENT_TAB, | 391 model()->OpenMatch(match, WindowOpenDisposition::CURRENT_TAB, |
| 393 alternate_nav_url, base::string16(), 0); | 392 alternate_nav_url, base::string16(), 0); |
| 394 EXPECT_TRUE(AutocompleteInput::HasHTTPScheme( | 393 EXPECT_TRUE(AutocompleteInput::HasHTTPScheme( |
| 395 client->alternate_nav_match().fill_into_edit)); | 394 client->alternate_nav_match().fill_into_edit)); |
| 396 } | 395 } |
| OLD | NEW |