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

Side by Side Diff: content/test/layouttest_support.cc

Issue 2537953003: WebString: makes string16 conversions explicit (part 1: blink, content) (Closed)
Patch Set: fix Created 4 years 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 "content/public/test/layouttest_support.h" 5 #include "content/public/test/layouttest_support.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 } 1065 }
1066 1066
1067 void DisableAutoResizeMode(RenderView* render_view, const WebSize& new_size) { 1067 void DisableAutoResizeMode(RenderView* render_view, const WebSize& new_size) {
1068 static_cast<RenderViewImpl*>(render_view)-> 1068 static_cast<RenderViewImpl*>(render_view)->
1069 DisableAutoResizeForTesting(new_size); 1069 DisableAutoResizeForTesting(new_size);
1070 } 1070 }
1071 1071
1072 // Returns True if node1 < node2. 1072 // Returns True if node1 < node2.
1073 bool HistoryEntryCompareLess(HistoryEntry::HistoryNode* node1, 1073 bool HistoryEntryCompareLess(HistoryEntry::HistoryNode* node1,
1074 HistoryEntry::HistoryNode* node2) { 1074 HistoryEntry::HistoryNode* node2) {
1075 base::string16 target1 = node1->item().target(); 1075 std::string target1 = node1->item().target().ascii();
1076 base::string16 target2 = node2->item().target(); 1076 std::string target2 = node2->item().target().ascii();
1077 return base::CompareCaseInsensitiveASCII(target1, target2) < 0; 1077 return base::CompareCaseInsensitiveASCII(target1, target2) < 0;
1078 } 1078 }
1079 1079
1080 std::string DumpHistoryItem(HistoryEntry::HistoryNode* node, 1080 std::string DumpHistoryItem(HistoryEntry::HistoryNode* node,
1081 int indent, 1081 int indent,
1082 bool is_current_index) { 1082 bool is_current_index) {
1083 std::string result; 1083 std::string result;
1084 1084
1085 const blink::WebHistoryItem& item = node->item(); 1085 const blink::WebHistoryItem& item = node->item();
1086 if (is_current_index) { 1086 if (is_current_index) {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 1134
1135 void ForceTextInputStateUpdateForRenderFrame(RenderFrame* frame) { 1135 void ForceTextInputStateUpdateForRenderFrame(RenderFrame* frame) {
1136 if (auto* render_widget = 1136 if (auto* render_widget =
1137 static_cast<RenderFrameImpl*>(frame)->GetRenderWidget()) { 1137 static_cast<RenderFrameImpl*>(frame)->GetRenderWidget()) {
1138 render_widget->UpdateTextInputState(ShowIme::IF_NEEDED, 1138 render_widget->UpdateTextInputState(ShowIme::IF_NEEDED,
1139 ChangeSource::FROM_NON_IME); 1139 ChangeSource::FROM_NON_IME);
1140 } 1140 }
1141 } 1141 }
1142 1142
1143 } // namespace content 1143 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/layout_test/blink_test_runner.cc ('k') | content/test/mock_webclipboard_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698