OLD | NEW |
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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2665 if (HasFocus()) { | 2665 if (HasFocus()) { |
2666 ui::InputMethod* input_method = GetInputMethod(); | 2666 ui::InputMethod* input_method = GetInputMethod(); |
2667 if (input_method) | 2667 if (input_method) |
2668 input_method->SetFocusedTextInputClient(this); | 2668 input_method->SetFocusedTextInputClient(this); |
2669 } | 2669 } |
2670 | 2670 |
2671 #if defined(OS_WIN) | 2671 #if defined(OS_WIN) |
2672 UpdateLegacyWin(); | 2672 UpdateLegacyWin(); |
2673 #endif | 2673 #endif |
2674 | 2674 |
| 2675 window_->GetHost()->compositor()->SetDisplayColorSpace( |
| 2676 gfx::ICCProfile::FromBestMonitor().GetColorSpace()); |
2675 delegated_frame_host_->SetCompositor(window_->GetHost()->compositor()); | 2677 delegated_frame_host_->SetCompositor(window_->GetHost()->compositor()); |
2676 } | 2678 } |
2677 | 2679 |
2678 void RenderWidgetHostViewAura::RemovingFromRootWindow() { | 2680 void RenderWidgetHostViewAura::RemovingFromRootWindow() { |
2679 aura::client::CursorClient* cursor_client = | 2681 aura::client::CursorClient* cursor_client = |
2680 aura::client::GetCursorClient(window_->GetRootWindow()); | 2682 aura::client::GetCursorClient(window_->GetRootWindow()); |
2681 if (cursor_client) | 2683 if (cursor_client) |
2682 cursor_client->RemoveObserver(this); | 2684 cursor_client->RemoveObserver(this); |
2683 | 2685 |
2684 DetachFromInputMethod(); | 2686 DetachFromInputMethod(); |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3044 ->GetTextSelection(focused_view) | 3046 ->GetTextSelection(focused_view) |
3045 ->GetSelectedText(&selected_text)) { | 3047 ->GetSelectedText(&selected_text)) { |
3046 // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard. | 3048 // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard. |
3047 ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION); | 3049 ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION); |
3048 clipboard_writer.WriteText(selected_text); | 3050 clipboard_writer.WriteText(selected_text); |
3049 } | 3051 } |
3050 #endif // defined(USE_X11) && !defined(OS_CHROMEOS) | 3052 #endif // defined(USE_X11) && !defined(OS_CHROMEOS) |
3051 } | 3053 } |
3052 | 3054 |
3053 } // namespace content | 3055 } // namespace content |
OLD | NEW |