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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 113403006: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 2240 matching lines...) Expand 10 before | Expand all | Expand 10 after
2251 has_composition_text_ = false; 2251 has_composition_text_ = false;
2252 } 2252 }
2253 2253
2254 void RenderWidgetHostViewAura::InsertText(const base::string16& text) { 2254 void RenderWidgetHostViewAura::InsertText(const base::string16& text) {
2255 DCHECK(text_input_type_ != ui::TEXT_INPUT_TYPE_NONE); 2255 DCHECK(text_input_type_ != ui::TEXT_INPUT_TYPE_NONE);
2256 if (host_) 2256 if (host_)
2257 host_->ImeConfirmComposition(text, gfx::Range::InvalidRange(), false); 2257 host_->ImeConfirmComposition(text, gfx::Range::InvalidRange(), false);
2258 has_composition_text_ = false; 2258 has_composition_text_ = false;
2259 } 2259 }
2260 2260
2261 void RenderWidgetHostViewAura::InsertChar(char16 ch, int flags) { 2261 void RenderWidgetHostViewAura::InsertChar(base::char16 ch, int flags) {
2262 if (popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab()) { 2262 if (popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab()) {
2263 popup_child_host_view_->InsertChar(ch, flags); 2263 popup_child_host_view_->InsertChar(ch, flags);
2264 return; 2264 return;
2265 } 2265 }
2266 2266
2267 // Ignore character messages for VKEY_RETURN sent on CTRL+M. crbug.com/315547 2267 // Ignore character messages for VKEY_RETURN sent on CTRL+M. crbug.com/315547
2268 if (host_ && (accept_return_character_ || ch != ui::VKEY_RETURN)) { 2268 if (host_ && (accept_return_character_ || ch != ui::VKEY_RETURN)) {
2269 double now = ui::EventTimeForNow().InSecondsF(); 2269 double now = ui::EventTimeForNow().InSecondsF();
2270 // Send a blink::WebInputEvent::Char event to |host_|. 2270 // Send a blink::WebInputEvent::Char event to |host_|.
2271 NativeWebKeyboardEvent webkit_event(ui::ET_KEY_PRESSED, 2271 NativeWebKeyboardEvent webkit_event(ui::ET_KEY_PRESSED,
(...skipping 1214 matching lines...) Expand 10 before | Expand all | Expand 10 after
3486 RenderWidgetHost* widget) { 3486 RenderWidgetHost* widget) {
3487 return new RenderWidgetHostViewAura(widget); 3487 return new RenderWidgetHostViewAura(widget);
3488 } 3488 }
3489 3489
3490 // static 3490 // static
3491 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { 3491 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
3492 GetScreenInfoForWindow(results, NULL); 3492 GetScreenInfoForWindow(results, NULL);
3493 } 3493 }
3494 3494
3495 } // namespace content 3495 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698