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_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
929 | 929 |
930 void WebContentsImpl::NotifyNavigationStateChanged(unsigned changed_flags) { | 930 void WebContentsImpl::NotifyNavigationStateChanged(unsigned changed_flags) { |
931 if (delegate_) | 931 if (delegate_) |
932 delegate_->NavigationStateChanged(this, changed_flags); | 932 delegate_->NavigationStateChanged(this, changed_flags); |
933 } | 933 } |
934 | 934 |
935 base::TimeTicks WebContentsImpl::GetLastSelectedTime() const { | 935 base::TimeTicks WebContentsImpl::GetLastSelectedTime() const { |
936 return last_selected_time_; | 936 return last_selected_time_; |
937 } | 937 } |
938 | 938 |
939 void WebContentsImpl::WasRestored() { | 939 void WebContentsImpl::WasShown() { |
940 controller_.SetActive(true); | 940 controller_.SetActive(true); |
941 RenderWidgetHostViewPort* rwhv = | 941 RenderWidgetHostViewPort* rwhv = |
942 RenderWidgetHostViewPort::FromRWHV(GetRenderWidgetHostView()); | 942 RenderWidgetHostViewPort::FromRWHV(GetRenderWidgetHostView()); |
943 if (rwhv) { | 943 if (rwhv) { |
944 rwhv->WasRestored(); | 944 rwhv->WasShown(); |
945 #if defined(OS_MACOSX) | 945 #if defined(OS_MACOSX) |
946 rwhv->SetActive(true); | 946 rwhv->SetActive(true); |
947 #endif | 947 #endif |
948 } | 948 } |
949 | 949 |
950 last_selected_time_ = base::TimeTicks::Now(); | 950 last_selected_time_ = base::TimeTicks::Now(); |
951 | 951 |
952 FOR_EACH_OBSERVER(WebContentsObserver, observers_, WasRestored()); | 952 FOR_EACH_OBSERVER(WebContentsObserver, observers_, WasShown()); |
953 | 953 |
954 // The resize rect might have changed while this was inactive -- send the new | 954 // The resize rect might have changed while this was inactive -- send the new |
955 // one to make sure it's up to date. | 955 // one to make sure it's up to date. |
956 RenderViewHostImpl* rvh = | 956 RenderViewHostImpl* rvh = |
957 static_cast<RenderViewHostImpl*>(GetRenderViewHost()); | 957 static_cast<RenderViewHostImpl*>(GetRenderViewHost()); |
958 if (rvh) { | 958 if (rvh) { |
959 rvh->ResizeRectChanged(GetRootWindowResizerRect()); | 959 rvh->ResizeRectChanged(GetRootWindowResizerRect()); |
960 } | 960 } |
961 | 961 |
962 bool is_visible = true; | 962 bool is_visible = true; |
(...skipping 2168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3131 browser_plugin_host()->embedder_render_process_host(); | 3131 browser_plugin_host()->embedder_render_process_host(); |
3132 *embedder_container_id = browser_plugin_host()->instance_id(); | 3132 *embedder_container_id = browser_plugin_host()->instance_id(); |
3133 int embedder_process_id = | 3133 int embedder_process_id = |
3134 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; | 3134 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; |
3135 if (embedder_process_id != -1) { | 3135 if (embedder_process_id != -1) { |
3136 *embedder_channel_name = | 3136 *embedder_channel_name = |
3137 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), | 3137 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), |
3138 embedder_process_id); | 3138 embedder_process_id); |
3139 } | 3139 } |
3140 } | 3140 } |
OLD | NEW |