diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 16:07:11 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 16:07:11 +0000 |
| commit | f9db7d2d160515ddac6eca9e7e04881b862c18db (patch) | |
| tree | 0fd71a1902aacd5b797c477c231109570c4fbe67 /content/renderer/render_widget.cc | |
| parent | 489a0cf8bbe82a2cba05f5b002a47dc61d11966e (diff) | |
| download | chromium_src-f9db7d2d160515ddac6eca9e7e04881b862c18db.zip chromium_src-f9db7d2d160515ddac6eca9e7e04881b862c18db.tar.gz chromium_src-f9db7d2d160515ddac6eca9e7e04881b862c18db.tar.bz2 | |
Simplify some Win Aura ifdefs.
R=scottmg@chromium.org
TBR=ben
Review URL: https://codereview.chromium.org/233263005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_widget.cc')
| -rw-r--r-- | content/renderer/render_widget.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 3066793..e3ee47b 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -2147,7 +2147,7 @@ void RenderWidget::OnImeSetComposition( // sure we are in a consistent state. Send(new ViewHostMsg_ImeCancelComposition(routing_id())); } -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) +#if defined(OS_MACOSX) || defined(USE_AURA) UpdateCompositionInfo(true); #endif } @@ -2166,7 +2166,7 @@ void RenderWidget::OnImeConfirmComposition(const base::string16& text, else webwidget_->confirmComposition(WebWidget::DoNotKeepSelection); handling_input_event_ = false; -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) +#if defined(OS_MACOSX) || defined(USE_AURA) UpdateCompositionInfo(true); #endif } @@ -2507,7 +2507,7 @@ void RenderWidget::UpdateSelectionBounds() { params.is_anchor_first = webwidget_->isSelectionAnchorFirst(); Send(new ViewHostMsg_SelectionBoundsChanged(routing_id_, params)); } -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) +#if defined(OS_MACOSX) || defined(USE_AURA) UpdateCompositionInfo(false); #endif } @@ -2562,7 +2562,7 @@ ui::TextInputType RenderWidget::GetTextInputType() { return ui::TEXT_INPUT_TYPE_NONE; } -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) +#if defined(OS_MACOSX) || defined(USE_AURA) void RenderWidget::UpdateCompositionInfo(bool should_update_range) { gfx::Range range = gfx::Range(); if (should_update_range) { @@ -2641,7 +2641,7 @@ void RenderWidget::resetInputMethod() { Send(new ViewHostMsg_ImeCancelComposition(routing_id())); } -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) +#if defined(OS_MACOSX) || defined(USE_AURA) UpdateCompositionInfo(true); #endif } |