chrome/renderer/searchbox/searchbox_extension.cc - Issue 450053003: Use a qualified path for grit includes in various chrome/ directories.

Side by Side Diff: chrome/renderer/searchbox/searchbox_extension.cc

Issue 450053003: Use a qualified path for grit includes in various chrome/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove webkit strings that no longer exist Created 6 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

« no previous file with comments | « chrome/renderer/printing/print_web_view_helper.cc ('k') | chrome/renderer/security_filter_peer.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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 "chrome/renderer/searchbox/searchbox_extension.h"	5 #include "chrome/renderer/searchbox/searchbox_extension.h"

6	6

7 #include "base/i18n/rtl.h"	7 #include "base/i18n/rtl.h"

8 #include "base/json/string_escape.h"	8 #include "base/json/string_escape.h"

9 #include "base/strings/string_number_conversions.h"	9 #include "base/strings/string_number_conversions.h"

10 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "base/strings/stringprintf.h"	11 #include "base/strings/stringprintf.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "chrome/common/instant_types.h"	13 #include "chrome/common/instant_types.h"

14 #include "chrome/common/ntp_logging_events.h"	14 #include "chrome/common/ntp_logging_events.h"

15 #include "chrome/common/url_constants.h"	15 #include "chrome/common/url_constants.h"

	16 #include "chrome/grit/renderer_resources.h"

16 #include "chrome/renderer/searchbox/searchbox.h"	17 #include "chrome/renderer/searchbox/searchbox.h"

17 #include "content/public/renderer/render_view.h"	18 #include "content/public/renderer/render_view.h"

18 #include "extensions/common/extension.h"	19 #include "extensions/common/extension.h"

19 #include "grit/renderer_resources.h"

20 #include "third_party/WebKit/public/platform/WebURLRequest.h"	20 #include "third_party/WebKit/public/platform/WebURLRequest.h"

21 #include "third_party/WebKit/public/web/WebDocument.h"	21 #include "third_party/WebKit/public/web/WebDocument.h"

22 #include "third_party/WebKit/public/web/WebLocalFrame.h"	22 #include "third_party/WebKit/public/web/WebLocalFrame.h"

23 #include "third_party/WebKit/public/web/WebScriptSource.h"	23 #include "third_party/WebKit/public/web/WebScriptSource.h"

24 #include "third_party/WebKit/public/web/WebView.h"	24 #include "third_party/WebKit/public/web/WebView.h"

25 #include "ui/base/resource/resource_bundle.h"	25 #include "ui/base/resource/resource_bundle.h"

26 #include "ui/base/window_open_disposition.h"	26 #include "ui/base/window_open_disposition.h"

27 #include "ui/events/keycodes/keyboard_codes.h"	27 #include "ui/events/keycodes/keyboard_codes.h"

28 #include "url/gurl.h"	28 #include "url/gurl.h"

29 #include "url/url_constants.h"	29 #include "url/url_constants.h"

(...skipping 1088 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1118 if (!render_view) return;	1118 if (!render_view) return;

1119	1119

1120 bool display_instant_results =	1120 bool display_instant_results =

1121 SearchBox::Get(render_view)->display_instant_results();	1121 SearchBox::Get(render_view)->display_instant_results();

1122 DVLOG(1) << render_view << " GetDisplayInstantResults" <<	1122 DVLOG(1) << render_view << " GetDisplayInstantResults" <<

1123 display_instant_results;	1123 display_instant_results;

1124 args.GetReturnValue().Set(display_instant_results);	1124 args.GetReturnValue().Set(display_instant_results);

1125 }	1125 }

1126	1126

1127 } // namespace extensions_v8	1127 } // namespace extensions_v8

OLD	NEW