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

Side by Side Diff: components/omnibox/browser/omnibox_view.cc

Issue 2712513004: Use a qualified path for grit-generated headers in components/ (Closed)
Patch Set: more checkdeps Created 3 years, 9 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 // This file defines helper functions shared by the various implementations 5 // This file defines helper functions shared by the various implementations
6 // of OmniboxView. 6 // of OmniboxView.
7 7
8 #include "components/omnibox/browser/omnibox_view.h" 8 #include "components/omnibox/browser/omnibox_view.h"
9 9
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "components/grit/components_scaled_resources.h"
16 #include "components/omnibox/browser/autocomplete_match.h" 17 #include "components/omnibox/browser/autocomplete_match.h"
17 #include "components/omnibox/browser/omnibox_client.h" 18 #include "components/omnibox/browser/omnibox_client.h"
18 #include "components/omnibox/browser/omnibox_edit_controller.h" 19 #include "components/omnibox/browser/omnibox_edit_controller.h"
19 #include "components/omnibox/browser/omnibox_edit_model.h" 20 #include "components/omnibox/browser/omnibox_edit_model.h"
20 #include "components/toolbar/toolbar_model.h" 21 #include "components/toolbar/toolbar_model.h"
21 #include "grit/components_scaled_resources.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/gfx/vector_icons_public.h" 23 #include "ui/gfx/vector_icons_public.h"
24 24
25 // static 25 // static
26 base::string16 OmniboxView::StripJavascriptSchemas(const base::string16& text) { 26 base::string16 OmniboxView::StripJavascriptSchemas(const base::string16& text) {
27 const base::string16 kJsPrefix( 27 const base::string16 kJsPrefix(
28 base::ASCIIToUTF16(url::kJavaScriptScheme) + base::ASCIIToUTF16(":")); 28 base::ASCIIToUTF16(url::kJavaScriptScheme) + base::ASCIIToUTF16(":"));
29 base::string16 out(text); 29 base::string16 out(text);
30 while (base::StartsWith(out, kJsPrefix, 30 while (base::StartsWith(out, kJsPrefix,
31 base::CompareCase::INSENSITIVE_ASCII)) { 31 base::CompareCase::INSENSITIVE_ASCII)) {
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 if (client) { 178 if (client) {
179 model_.reset(new OmniboxEditModel(this, controller, std::move(client))); 179 model_.reset(new OmniboxEditModel(this, controller, std::move(client)));
180 } 180 }
181 } 181 }
182 182
183 void OmniboxView::TextChanged() { 183 void OmniboxView::TextChanged() {
184 EmphasizeURLComponents(); 184 EmphasizeURLComponents();
185 if (model_.get()) 185 if (model_.get())
186 model_->OnChanged(); 186 model_->OnChanged();
187 } 187 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698