| 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 2399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2410 } | 2410 } |
| 2411 | 2411 |
| 2412 void RenderWidgetHostViewAura::CreateAuraWindow() { | 2412 void RenderWidgetHostViewAura::CreateAuraWindow() { |
| 2413 DCHECK(!window_); | 2413 DCHECK(!window_); |
| 2414 window_ = new aura::Window(this); | 2414 window_ = new aura::Window(this); |
| 2415 window_observer_.reset(new WindowObserver(this)); | 2415 window_observer_.reset(new WindowObserver(this)); |
| 2416 | 2416 |
| 2417 aura::client::SetTooltipText(window_, &tooltip_); | 2417 aura::client::SetTooltipText(window_, &tooltip_); |
| 2418 aura::client::SetActivationDelegate(window_, this); | 2418 aura::client::SetActivationDelegate(window_, this); |
| 2419 aura::client::SetFocusChangeObserver(window_, this); | 2419 aura::client::SetFocusChangeObserver(window_, this); |
| 2420 window_->set_layer_owner_delegate(delegated_frame_host_.get()); | |
| 2421 display::Screen::GetScreen()->AddObserver(this); | 2420 display::Screen::GetScreen()->AddObserver(this); |
| 2422 } | 2421 } |
| 2423 | 2422 |
| 2424 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { | 2423 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { |
| 2425 if (host_->GetProcess()->FastShutdownStarted()) | 2424 if (host_->GetProcess()->FastShutdownStarted()) |
| 2426 return; | 2425 return; |
| 2427 | 2426 |
| 2428 aura::Window* root_window = window_->GetRootWindow(); | 2427 aura::Window* root_window = window_->GetRootWindow(); |
| 2429 if (!root_window) | 2428 if (!root_window) |
| 2430 return; | 2429 return; |
| (...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3064 ->GetTextSelection(focused_view) | 3063 ->GetTextSelection(focused_view) |
| 3065 ->GetSelectedText(&selected_text)) { | 3064 ->GetSelectedText(&selected_text)) { |
| 3066 // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard. | 3065 // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard. |
| 3067 ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION); | 3066 ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION); |
| 3068 clipboard_writer.WriteText(selected_text); | 3067 clipboard_writer.WriteText(selected_text); |
| 3069 } | 3068 } |
| 3070 #endif // defined(USE_X11) && !defined(OS_CHROMEOS) | 3069 #endif // defined(USE_X11) && !defined(OS_CHROMEOS) |
| 3071 } | 3070 } |
| 3072 | 3071 |
| 3073 } // namespace content | 3072 } // namespace content |
| OLD | NEW |