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

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

Issue 21042013: Have SearchProvider look up the omnibox start margin directly. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Rebase and respond to comments. Created 7 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
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/strings/utf_string_conversions.h" 5 #include "base/strings/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/browser/ui/toolbar/test_toolbar_model.h" 11 #include "chrome/browser/ui/toolbar/test_toolbar_model.h"
12 #include "chrome/test/base/testing_browser_process.h" 12 #include "chrome/test/base/testing_browser_process.h"
13 #include "chrome/test/base/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/gfx/font.h" 15 #include "ui/gfx/font.h"
16 #include "ui/gfx/image/image.h" 16 #include "ui/gfx/image/image.h"
17 #include "ui/gfx/rect.h"
18 17
19 using content::WebContents; 18 using content::WebContents;
20 19
21 namespace { 20 namespace {
22 21
23 class TestingOmniboxView : public OmniboxView { 22 class TestingOmniboxView : public OmniboxView {
24 public: 23 public:
25 explicit TestingOmniboxView(ToolbarModel* model) 24 explicit TestingOmniboxView(ToolbarModel* model)
26 : OmniboxView(NULL, NULL, model, NULL) {} 25 : OmniboxView(NULL, NULL, model, NULL) {}
27 26
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 virtual void OnSelectionBoundsChanged() OVERRIDE {} 97 virtual void OnSelectionBoundsChanged() OVERRIDE {}
99 virtual void OnInputInProgress(bool in_progress) OVERRIDE {} 98 virtual void OnInputInProgress(bool in_progress) OVERRIDE {}
100 virtual void OnKillFocus() OVERRIDE {} 99 virtual void OnKillFocus() OVERRIDE {}
101 virtual void OnSetFocus() OVERRIDE {} 100 virtual void OnSetFocus() OVERRIDE {}
102 virtual gfx::Image GetFavicon() const OVERRIDE { return gfx::Image(); } 101 virtual gfx::Image GetFavicon() const OVERRIDE { return gfx::Image(); }
103 virtual string16 GetTitle() const OVERRIDE { return string16(); } 102 virtual string16 GetTitle() const OVERRIDE { return string16(); }
104 virtual InstantController* GetInstant() OVERRIDE { return NULL; } 103 virtual InstantController* GetInstant() OVERRIDE { return NULL; }
105 virtual WebContents* GetWebContents() const OVERRIDE { 104 virtual WebContents* GetWebContents() const OVERRIDE {
106 return NULL; 105 return NULL;
107 } 106 }
108 virtual gfx::Rect GetOmniboxBounds() const OVERRIDE { return gfx::Rect(); }
109 107
110 private: 108 private:
111 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); 109 DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController);
112 }; 110 };
113 111
114 } // namespace 112 } // namespace
115 113
116 class AutocompleteEditTest : public ::testing::Test { 114 class AutocompleteEditTest : public ::testing::Test {
117 public: 115 public:
118 TestToolbarModel* toolbar_model() { return &toolbar_model_; } 116 TestToolbarModel* toolbar_model() { return &toolbar_model_; }
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 GURL url; 195 GURL url;
198 bool write_url; 196 bool write_url;
199 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected, 197 model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected,
200 &result, &url, &write_url); 198 &result, &url, &write_url);
201 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i; 199 EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i;
202 EXPECT_EQ(input[i].write_url, write_url) << " @" << i; 200 EXPECT_EQ(input[i].write_url, write_url) << " @" << i;
203 if (write_url) 201 if (write_url)
204 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i; 202 EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i;
205 } 203 }
206 } 204 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698