| 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 "base/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 6 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
| 7 #include "chrome/browser/search_engines/template_url_service_factory.h" | 7 #include "chrome/browser/search_engines/template_url_service_factory.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_edit_model.h" | 9 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" |
| 10 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 10 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 content::PageTransition transition, | 90 content::PageTransition transition, |
| 91 const GURL& alternate_nav_url) OVERRIDE {} | 91 const GURL& alternate_nav_url) OVERRIDE {} |
| 92 virtual void OnChanged() OVERRIDE {} | 92 virtual void OnChanged() OVERRIDE {} |
| 93 virtual void OnSelectionBoundsChanged() OVERRIDE {} | 93 virtual void OnSelectionBoundsChanged() OVERRIDE {} |
| 94 virtual void OnInputInProgress(bool in_progress) OVERRIDE {} | 94 virtual void OnInputInProgress(bool in_progress) OVERRIDE {} |
| 95 virtual void OnKillFocus() OVERRIDE {} | 95 virtual void OnKillFocus() OVERRIDE {} |
| 96 virtual void OnSetFocus() OVERRIDE {} | 96 virtual void OnSetFocus() OVERRIDE {} |
| 97 virtual gfx::Image GetFavicon() const OVERRIDE { return gfx::Image(); } | 97 virtual gfx::Image GetFavicon() const OVERRIDE { return gfx::Image(); } |
| 98 virtual string16 GetTitle() const OVERRIDE { return string16(); } | 98 virtual string16 GetTitle() const OVERRIDE { return string16(); } |
| 99 virtual InstantController* GetInstant() OVERRIDE { return NULL; } | 99 virtual InstantController* GetInstant() OVERRIDE { return NULL; } |
| 100 virtual TabContents* GetTabContents() const OVERRIDE { | 100 virtual WebContents* GetWebContents() const OVERRIDE { |
| 101 return NULL; | 101 return NULL; |
| 102 } | 102 } |
| 103 | 103 |
| 104 private: | 104 private: |
| 105 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); | 105 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); |
| 106 }; | 106 }; |
| 107 | 107 |
| 108 } // namespace | 108 } // namespace |
| 109 | 109 |
| 110 class AutocompleteEditTest : public ::testing::Test {}; | 110 class AutocompleteEditTest : public ::testing::Test {}; |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 GURL url; | 173 GURL url; |
| 174 bool write_url; | 174 bool write_url; |
| 175 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected, | 175 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected, |
| 176 &result, &url, &write_url); | 176 &result, &url, &write_url); |
| 177 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i; | 177 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i; |
| 178 EXPECT_EQ(input[i].write_url, write_url) << " @" << i; | 178 EXPECT_EQ(input[i].write_url, write_url) << " @" << i; |
| 179 if (write_url) | 179 if (write_url) |
| 180 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i; | 180 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i; |
| 181 } | 181 } |
| 182 } | 182 } |
| OLD | NEW |