| 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/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1142 AttachTouchEditableToRenderView(); | 1142 AttachTouchEditableToRenderView(); |
| 1143 return view; | 1143 return view; |
| 1144 } | 1144 } |
| 1145 | 1145 |
| 1146 RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForPopupWidget( | 1146 RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForPopupWidget( |
| 1147 RenderWidgetHost* render_widget_host) { | 1147 RenderWidgetHost* render_widget_host) { |
| 1148 return new RenderWidgetHostViewAura(render_widget_host); | 1148 return new RenderWidgetHostViewAura(render_widget_host); |
| 1149 } | 1149 } |
| 1150 | 1150 |
| 1151 void WebContentsViewAura::SetPageTitle(const base::string16& title) { | 1151 void WebContentsViewAura::SetPageTitle(const base::string16& title) { |
| 1152 window_->set_title(title); | 1152 window_->SetTitle(title); |
| 1153 } | 1153 } |
| 1154 | 1154 |
| 1155 void WebContentsViewAura::RenderViewCreated(RenderViewHost* host) { | 1155 void WebContentsViewAura::RenderViewCreated(RenderViewHost* host) { |
| 1156 } | 1156 } |
| 1157 | 1157 |
| 1158 void WebContentsViewAura::RenderViewSwappedIn(RenderViewHost* host) { | 1158 void WebContentsViewAura::RenderViewSwappedIn(RenderViewHost* host) { |
| 1159 if (navigation_overlay_.get() && navigation_overlay_->has_window()) | 1159 if (navigation_overlay_.get() && navigation_overlay_->has_window()) |
| 1160 navigation_overlay_->StartObserving(); | 1160 navigation_overlay_->StartObserving(); |
| 1161 AttachTouchEditableToRenderView(); | 1161 AttachTouchEditableToRenderView(); |
| 1162 } | 1162 } |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1583 void WebContentsViewAura::OnWindowVisibilityChanged(aura::Window* window, | 1583 void WebContentsViewAura::OnWindowVisibilityChanged(aura::Window* window, |
| 1584 bool visible) { | 1584 bool visible) { |
| 1585 // Ignore any visibility changes in the hierarchy below. | 1585 // Ignore any visibility changes in the hierarchy below. |
| 1586 if (window != window_.get() && window_->Contains(window)) | 1586 if (window != window_.get() && window_->Contains(window)) |
| 1587 return; | 1587 return; |
| 1588 | 1588 |
| 1589 UpdateWebContentsVisibility(web_contents_, visible); | 1589 UpdateWebContentsVisibility(web_contents_, visible); |
| 1590 } | 1590 } |
| 1591 | 1591 |
| 1592 } // namespace content | 1592 } // namespace content |
| OLD | NEW |