OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_edit.h" | 6 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
7 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" | 7 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" |
8 #include "chrome/test/testing_profile.h" | 8 #include "chrome/test/testing_profile.h" |
9 #include "third_party/skia/include/core/SkBitmap.h" | 9 #include "third_party/skia/include/core/SkBitmap.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 virtual bool OnInlineAutocompleteTextMaybeChanged( | 49 virtual bool OnInlineAutocompleteTextMaybeChanged( |
50 const string16& display_text, size_t user_text_length) { | 50 const string16& display_text, size_t user_text_length) { |
51 return false; | 51 return false; |
52 } | 52 } |
53 virtual void OnRevertTemporaryText() {} | 53 virtual void OnRevertTemporaryText() {} |
54 virtual void OnBeforePossibleChange() {} | 54 virtual void OnBeforePossibleChange() {} |
55 virtual bool OnAfterPossibleChange() { return false; } | 55 virtual bool OnAfterPossibleChange() { return false; } |
56 virtual gfx::NativeView GetNativeView() const { return 0; } | 56 virtual gfx::NativeView GetNativeView() const { return 0; } |
57 virtual CommandUpdater* GetCommandUpdater() { return NULL; } | 57 virtual CommandUpdater* GetCommandUpdater() { return NULL; } |
58 virtual void SetInstantSuggestion(const string16& input) {} | 58 virtual void SetInstantSuggestion(const string16& input) {} |
| 59 virtual string16 GetInstantSuggestion() const { return string16(); } |
59 virtual int TextWidth() const { return 0; } | 60 virtual int TextWidth() const { return 0; } |
60 virtual bool IsImeComposing() const { return false; } | 61 virtual bool IsImeComposing() const { return false; } |
61 | 62 |
62 #if defined(TOOLKIT_VIEWS) | 63 #if defined(TOOLKIT_VIEWS) |
63 virtual views::View* AddToView(views::View* parent) { return NULL; } | 64 virtual views::View* AddToView(views::View* parent) { return NULL; } |
64 virtual bool CommitInstantSuggestion( | |
65 const string16& typed_text, | |
66 const string16& suggested_text) { return false; } | |
67 #endif | 65 #endif |
68 | 66 |
69 private: | 67 private: |
70 DISALLOW_COPY_AND_ASSIGN(TestingAutocompleteEditView); | 68 DISALLOW_COPY_AND_ASSIGN(TestingAutocompleteEditView); |
71 }; | 69 }; |
72 | 70 |
73 class TestingAutocompleteEditController : public AutocompleteEditController { | 71 class TestingAutocompleteEditController : public AutocompleteEditController { |
74 public: | 72 public: |
75 TestingAutocompleteEditController() {} | 73 TestingAutocompleteEditController() {} |
76 virtual void OnAutocompleteWillClosePopup() {} | 74 virtual void OnAutocompleteWillClosePopup() {} |
77 virtual void OnAutocompleteLosingFocus(gfx::NativeView view_gaining_focus) {} | 75 virtual void OnAutocompleteLosingFocus(gfx::NativeView view_gaining_focus) {} |
78 virtual void OnAutocompleteWillAccept() {} | 76 virtual void OnAutocompleteWillAccept() {} |
79 virtual bool OnCommitSuggestedText(const string16& typed_text) { | 77 virtual bool OnCommitSuggestedText(bool skip_inline_autocomplete) { |
80 return false; | 78 return false; |
81 } | 79 } |
82 virtual bool AcceptCurrentInstantPreview() { | 80 virtual bool AcceptCurrentInstantPreview() { |
83 return false; | 81 return false; |
84 } | 82 } |
85 virtual void OnPopupBoundsChanged(const gfx::Rect& bounds) {} | 83 virtual void OnPopupBoundsChanged(const gfx::Rect& bounds) {} |
86 virtual void OnAutocompleteAccept(const GURL& url, | 84 virtual void OnAutocompleteAccept(const GURL& url, |
87 WindowOpenDisposition disposition, | 85 WindowOpenDisposition disposition, |
88 PageTransition::Type transition, | 86 PageTransition::Type transition, |
89 const GURL& alternate_nav_url) {} | 87 const GURL& alternate_nav_url) {} |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 GURL url; | 152 GURL url; |
155 bool write_url; | 153 bool write_url; |
156 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected, | 154 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected, |
157 &result, &url, &write_url); | 155 &result, &url, &write_url); |
158 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i; | 156 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i; |
159 EXPECT_EQ(input[i].write_url, write_url) << " @" << i; | 157 EXPECT_EQ(input[i].write_url, write_url) << " @" << i; |
160 if (write_url) | 158 if (write_url) |
161 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i; | 159 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i; |
162 } | 160 } |
163 } | 161 } |
OLD | NEW |