| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 const string16& display_text, size_t user_text_length) OVERRIDE { | 51 const string16& display_text, size_t user_text_length) OVERRIDE { |
| 52 return false; | 52 return false; |
| 53 } | 53 } |
| 54 virtual void OnRevertTemporaryText() OVERRIDE {} | 54 virtual void OnRevertTemporaryText() OVERRIDE {} |
| 55 virtual void OnBeforePossibleChange() OVERRIDE {} | 55 virtual void OnBeforePossibleChange() OVERRIDE {} |
| 56 virtual bool OnAfterPossibleChange() OVERRIDE { return false; } | 56 virtual bool OnAfterPossibleChange() OVERRIDE { return false; } |
| 57 virtual gfx::NativeView GetNativeView() const OVERRIDE { return NULL; } | 57 virtual gfx::NativeView GetNativeView() const OVERRIDE { return NULL; } |
| 58 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE { | 58 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE { |
| 59 return NULL; | 59 return NULL; |
| 60 } | 60 } |
| 61 virtual void SetInstantSuggestion(const string16& input, | 61 virtual void SetInstantSuggestion(const string16& input) OVERRIDE {} |
| 62 bool animate_to_complete) OVERRIDE {} | |
| 63 virtual string16 GetInstantSuggestion() const OVERRIDE { return string16(); } | 62 virtual string16 GetInstantSuggestion() const OVERRIDE { return string16(); } |
| 64 virtual int TextWidth() const OVERRIDE { return 0; } | 63 virtual int TextWidth() const OVERRIDE { return 0; } |
| 65 virtual bool IsImeComposing() const OVERRIDE { return false; } | 64 virtual bool IsImeComposing() const OVERRIDE { return false; } |
| 66 | 65 |
| 67 #if defined(TOOLKIT_VIEWS) | 66 #if defined(TOOLKIT_VIEWS) |
| 68 virtual int GetMaxEditWidth(int entry_width) const OVERRIDE { | 67 virtual int GetMaxEditWidth(int entry_width) const OVERRIDE { |
| 69 return entry_width; | 68 return entry_width; |
| 70 } | 69 } |
| 71 virtual views::View* AddToView(views::View* parent) OVERRIDE { return NULL; } | 70 virtual views::View* AddToView(views::View* parent) OVERRIDE { return NULL; } |
| 72 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE { | 71 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 GURL url; | 173 GURL url; |
| 175 bool write_url; | 174 bool write_url; |
| 176 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected, | 175 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected, |
| 177 &result, &url, &write_url); | 176 &result, &url, &write_url); |
| 178 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i; | 177 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i; |
| 179 EXPECT_EQ(input[i].write_url, write_url) << " @" << i; | 178 EXPECT_EQ(input[i].write_url, write_url) << " @" << i; |
| 180 if (write_url) | 179 if (write_url) |
| 181 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i; | 180 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i; |
| 182 } | 181 } |
| 183 } | 182 } |
| OLD | NEW |