Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: chrome/browser/ui/omnibox/omnibox_edit_unittest.cc

Issue 10810062: Moving common code into OmniboxView from OmniboxView* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix final nits Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "chrome/test/base/testing_browser_process.h" 11 #include "chrome/test/base/testing_browser_process.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/skia/include/core/SkBitmap.h" 14 #include "third_party/skia/include/core/SkBitmap.h"
15 #include "ui/gfx/font.h" 15 #include "ui/gfx/font.h"
16 16
17 using content::WebContents; 17 using content::WebContents;
18 18
19 namespace { 19 namespace {
20 20
21 class TestingOmniboxView : public OmniboxView { 21 class TestingOmniboxView : public OmniboxView {
22 public: 22 public:
23 TestingOmniboxView() {} 23 TestingOmniboxView() : OmniboxView(NULL, NULL, NULL, NULL) {}
24 24
25 virtual OmniboxEditModel* model() OVERRIDE { return NULL; }
26 virtual const OmniboxEditModel* model() const OVERRIDE { return NULL; }
27 virtual void SaveStateToTab(WebContents* tab) OVERRIDE {} 25 virtual void SaveStateToTab(WebContents* tab) OVERRIDE {}
28 virtual void Update(const WebContents* tab_for_state_restoring) OVERRIDE {} 26 virtual void Update(const WebContents* tab_for_state_restoring) OVERRIDE {}
29 virtual void OpenMatch(const AutocompleteMatch& match, 27 virtual void OpenMatch(const AutocompleteMatch& match,
30 WindowOpenDisposition disposition, 28 WindowOpenDisposition disposition,
31 const GURL& alternate_nav_url, 29 const GURL& alternate_nav_url,
32 size_t selected_line) OVERRIDE {} 30 size_t selected_line) OVERRIDE {}
33 virtual string16 GetText() const OVERRIDE { return string16(); } 31 virtual string16 GetText() const OVERRIDE { return string16(); }
34 virtual bool IsEditingOrEmpty() const OVERRIDE { return true; }
35 virtual int GetIcon() const OVERRIDE { return 0; }
36 virtual void SetUserText(const string16& text) OVERRIDE {}
37 virtual void SetUserText(const string16& text, 32 virtual void SetUserText(const string16& text,
38 const string16& display_text, 33 const string16& display_text,
39 bool update_popup) OVERRIDE {} 34 bool update_popup) OVERRIDE {}
40 virtual void SetWindowTextAndCaretPos(const string16& text, 35 virtual void SetWindowTextAndCaretPos(const string16& text,
41 size_t caret_pos, 36 size_t caret_pos,
42 bool update_popup, 37 bool update_popup,
43 bool notify_text_changed) OVERRIDE {} 38 bool notify_text_changed) OVERRIDE {}
44 virtual void SetForcedQuery() OVERRIDE {} 39 virtual void SetForcedQuery() OVERRIDE {}
45 virtual bool IsSelectAll() const OVERRIDE { return false; } 40 virtual bool IsSelectAll() const OVERRIDE { return false; }
46 virtual bool DeleteAtEndPressed() OVERRIDE { return false; } 41 virtual bool DeleteAtEndPressed() OVERRIDE { return false; }
47 virtual void GetSelectionBounds(size_t* start, size_t* end) const OVERRIDE {} 42 virtual void GetSelectionBounds(size_t* start, size_t* end) const OVERRIDE {}
48 virtual void SelectAll(bool reversed) OVERRIDE {} 43 virtual void SelectAll(bool reversed) OVERRIDE {}
49 virtual void RevertAll() OVERRIDE {} 44 virtual void RevertAll() OVERRIDE {}
50 virtual void UpdatePopup() OVERRIDE {} 45 virtual void UpdatePopup() OVERRIDE {}
51 virtual void ClosePopup() OVERRIDE {}
52 virtual void SetFocus() OVERRIDE {} 46 virtual void SetFocus() OVERRIDE {}
53 virtual void OnTemporaryTextMaybeChanged( 47 virtual void OnTemporaryTextMaybeChanged(
54 const string16& display_text, 48 const string16& display_text,
55 bool save_original_selection) OVERRIDE {} 49 bool save_original_selection) OVERRIDE {}
56 virtual bool OnInlineAutocompleteTextMaybeChanged( 50 virtual bool OnInlineAutocompleteTextMaybeChanged(
57 const string16& display_text, size_t user_text_length) OVERRIDE { 51 const string16& display_text, size_t user_text_length) OVERRIDE {
58 return false; 52 return false;
59 } 53 }
60 virtual void OnRevertTemporaryText() OVERRIDE {} 54 virtual void OnRevertTemporaryText() OVERRIDE {}
61 virtual void OnBeforePossibleChange() OVERRIDE {} 55 virtual void OnBeforePossibleChange() OVERRIDE {}
62 virtual bool OnAfterPossibleChange() OVERRIDE { return false; } 56 virtual bool OnAfterPossibleChange() OVERRIDE { return false; }
63 virtual gfx::NativeView GetNativeView() const OVERRIDE { return NULL; } 57 virtual gfx::NativeView GetNativeView() const OVERRIDE { return NULL; }
64 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE { 58 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE {
65 return NULL; 59 return NULL;
66 } 60 }
67 virtual CommandUpdater* GetCommandUpdater() OVERRIDE { return NULL; }
68 virtual void SetInstantSuggestion(const string16& input, 61 virtual void SetInstantSuggestion(const string16& input,
69 bool animate_to_complete) OVERRIDE {} 62 bool animate_to_complete) OVERRIDE {}
70 virtual string16 GetInstantSuggestion() const OVERRIDE { return string16(); } 63 virtual string16 GetInstantSuggestion() const OVERRIDE { return string16(); }
71 virtual int TextWidth() const OVERRIDE { return 0; } 64 virtual int TextWidth() const OVERRIDE { return 0; }
72 virtual bool IsImeComposing() const OVERRIDE { return false; } 65 virtual bool IsImeComposing() const OVERRIDE { return false; }
73 66
74 #if defined(TOOLKIT_VIEWS) 67 #if defined(TOOLKIT_VIEWS)
75 virtual int GetMaxEditWidth(int entry_width) const OVERRIDE { 68 virtual int GetMaxEditWidth(int entry_width) const OVERRIDE {
76 return entry_width; 69 return entry_width;
77 } 70 }
78 virtual views::View* AddToView(views::View* parent) OVERRIDE { return NULL; } 71 virtual views::View* AddToView(views::View* parent) OVERRIDE { return NULL; }
79 virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE { 72 virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE {
80 return 0; 73 return 0;
81 } 74 }
82 virtual gfx::Font GetFont() { return gfx::Font(); } 75 virtual gfx::Font GetFont() { return gfx::Font(); }
83 virtual int WidthOfTextAfterCursor() { return 0; } 76 virtual int WidthOfTextAfterCursor() { return 0; }
84 #endif 77 #endif
85 78
79 virtual int GetOmniboxTextLength() const OVERRIDE { return 0; }
80 virtual void EmphasizeURLComponents() OVERRIDE { }
81
86 private: 82 private:
87 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxView); 83 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxView);
88 }; 84 };
89 85
90 class TestingOmniboxEditController : public OmniboxEditController { 86 class TestingOmniboxEditController : public OmniboxEditController {
91 public: 87 public:
92 TestingOmniboxEditController() {} 88 TestingOmniboxEditController() {}
93 virtual void OnAutocompleteAccept(const GURL& url, 89 virtual void OnAutocompleteAccept(const GURL& url,
94 WindowOpenDisposition disposition, 90 WindowOpenDisposition disposition,
95 content::PageTransition transition, 91 content::PageTransition transition,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 GURL url; 174 GURL url;
179 bool write_url; 175 bool write_url;
180 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected, 176 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected,
181 &result, &url, &write_url); 177 &result, &url, &write_url);
182 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i; 178 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i;
183 EXPECT_EQ(input[i].write_url, write_url) << " @" << i; 179 EXPECT_EQ(input[i].write_url, write_url) << " @" << i;
184 if (write_url) 180 if (write_url)
185 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i; 181 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i;
186 } 182 }
187 } 183 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_edit_model.cc ('k') | chrome/browser/ui/omnibox/omnibox_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698