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

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

Issue 21157006: change tsf_input_scopes::SetInputScopeForTsfUnawareWindow to SetInputScopesForTsfUnawareWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove singleton and add thread checking Created 7 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
« no previous file with comments | « no previous file | ui/base/ime/win/tsf_input_scope.h » ('j') | ui/base/ime/win/tsf_input_scope.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_win.h" 5 #include "content/browser/renderer_host/render_widget_host_view_win.h"
6 6
7 #include <InputScope.h> 7 #include <InputScope.h>
8 #include <wtsapi32.h> 8 #include <wtsapi32.h>
9 #pragma comment(lib, "wtsapi32.lib") 9 #pragma comment(lib, "wtsapi32.lib")
10 10
(...skipping 3144 matching lines...) Expand 10 before | Expand all | Expand 10 after
3155 } 3155 }
3156 } 3156 }
3157 3157
3158 void RenderWidgetHostViewWin::UpdateInputScopeIfNecessary( 3158 void RenderWidgetHostViewWin::UpdateInputScopeIfNecessary(
3159 ui::TextInputType text_input_type) { 3159 ui::TextInputType text_input_type) {
3160 // The text store is responsible for handling input scope when TSF-aware is 3160 // The text store is responsible for handling input scope when TSF-aware is
3161 // required. 3161 // required.
3162 if (base::win::IsTSFAwareRequired()) 3162 if (base::win::IsTSFAwareRequired())
3163 return; 3163 return;
3164 3164
3165 ui::tsf_inputscope::SetInputScopeForTsfUnawareWindow(m_hWnd, 3165 ui::tsf_inputscope::SetInputScopeForTsfUnawareWindow(
3166 text_input_type); 3166 m_hWnd, text_input_type, ui::TEXT_INPUT_MODE_DEFAULT);
3167 } 3167 }
3168 3168
3169 //////////////////////////////////////////////////////////////////////////////// 3169 ////////////////////////////////////////////////////////////////////////////////
3170 // RenderWidgetHostView, public: 3170 // RenderWidgetHostView, public:
3171 3171
3172 // static 3172 // static
3173 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( 3173 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
3174 RenderWidgetHost* widget) { 3174 RenderWidgetHost* widget) {
3175 return new RenderWidgetHostViewWin(widget); 3175 return new RenderWidgetHostViewWin(widget);
3176 } 3176 }
3177 3177
3178 // static 3178 // static
3179 void RenderWidgetHostViewPort::GetDefaultScreenInfo( 3179 void RenderWidgetHostViewPort::GetDefaultScreenInfo(
3180 WebKit::WebScreenInfo* results) { 3180 WebKit::WebScreenInfo* results) {
3181 GetScreenInfoForWindow(0, results); 3181 GetScreenInfoForWindow(0, results);
3182 } 3182 }
3183 3183
3184 } // namespace content 3184 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | ui/base/ime/win/tsf_input_scope.h » ('j') | ui/base/ime/win/tsf_input_scope.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698