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

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

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | 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/gtk_im_context_wrapper.h" 5 #include "content/browser/renderer_host/gtk_im_context_wrapper.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <gdk/gdkkeysyms.h> 8 #include <gdk/gdkkeysyms.h>
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 void GtkIMContextWrapper::ConfirmComposition() { 470 void GtkIMContextWrapper::ConfirmComposition() {
471 if (!is_enabled_) 471 if (!is_enabled_)
472 return; 472 return;
473 473
474 DCHECK(!is_in_key_event_handler_); 474 DCHECK(!is_in_key_event_handler_);
475 475
476 if (is_composing_text_) { 476 if (is_composing_text_) {
477 if (host_view_->GetRenderWidgetHost()) { 477 if (host_view_->GetRenderWidgetHost()) {
478 RenderWidgetHostImpl::From( 478 RenderWidgetHostImpl::From(
479 host_view_->GetRenderWidgetHost())->ImeConfirmComposition( 479 host_view_->GetRenderWidgetHost())->ImeConfirmComposition(
480 string16(), gfx::Range::InvalidRange(), false); 480 base::string16(), gfx::Range::InvalidRange(), false);
481 } 481 }
482 482
483 // Reset the input method. 483 // Reset the input method.
484 CancelComposition(); 484 CancelComposition();
485 } 485 }
486 } 486 }
487 487
488 void GtkIMContextWrapper::HandleCommit(const string16& text) { 488 void GtkIMContextWrapper::HandleCommit(const base::string16& text) {
489 if (suppress_next_commit_) 489 if (suppress_next_commit_)
490 return; 490 return;
491 491
492 // Append the text to the buffer, because commit signal might be fired 492 // Append the text to the buffer, because commit signal might be fired
493 // multiple times when processing a key event. 493 // multiple times when processing a key event.
494 commit_text_.append(text); 494 commit_text_.append(text);
495 // Nothing needs to do, if it's currently in ProcessKeyEvent() 495 // Nothing needs to do, if it's currently in ProcessKeyEvent()
496 // handler, which will send commit text to webkit later. Otherwise, 496 // handler, which will send commit text to webkit later. Otherwise,
497 // we need send it here. 497 // we need send it here.
498 // It's possible that commit signal is fired without a key event, for 498 // It's possible that commit signal is fired without a key event, for
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 GtkWidget* widget, GtkIMContextWrapper* self) { 656 GtkWidget* widget, GtkIMContextWrapper* self) {
657 self->HandleHostViewRealize(widget); 657 self->HandleHostViewRealize(widget);
658 } 658 }
659 659
660 void GtkIMContextWrapper::HandleHostViewUnrealizeThunk( 660 void GtkIMContextWrapper::HandleHostViewUnrealizeThunk(
661 GtkWidget* widget, GtkIMContextWrapper* self) { 661 GtkWidget* widget, GtkIMContextWrapper* self) {
662 self->HandleHostViewUnrealize(); 662 self->HandleHostViewUnrealize();
663 } 663 }
664 664
665 } // namespace content 665 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/gtk_im_context_wrapper.h ('k') | content/browser/renderer_host/ime_adapter_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698