OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "extensions/browser/app_window/app_window_contents.h" | 5 #include "extensions/browser/app_window/app_window_contents.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "content/public/browser/browser_context.h" | 10 #include "content/public/browser/browser_context.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 if (web_contents_->GetRenderViewHost()->GetProcess()->GetID() == | 49 if (web_contents_->GetRenderViewHost()->GetProcess()->GetID() == |
50 creator_process_id) { | 50 creator_process_id) { |
51 SuspendRenderViewHost(web_contents_->GetRenderViewHost()); | 51 SuspendRenderViewHost(web_contents_->GetRenderViewHost()); |
52 } else { | 52 } else { |
53 VLOG(1) << "AppWindow created in new process (" | 53 VLOG(1) << "AppWindow created in new process (" |
54 << web_contents_->GetRenderViewHost()->GetProcess()->GetID() | 54 << web_contents_->GetRenderViewHost()->GetProcess()->GetID() |
55 << ") != creator (" << creator_process_id << "). Routing disabled."; | 55 << ") != creator (" << creator_process_id << "). Routing disabled."; |
56 } | 56 } |
57 | 57 |
58 web_contents_->GetController().LoadURL( | 58 web_contents_->GetController().LoadURL( |
59 url_, content::Referrer(), content::PAGE_TRANSITION_LINK, | 59 url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, |
60 std::string()); | 60 std::string()); |
61 } | 61 } |
62 | 62 |
63 void AppWindowContentsImpl::NativeWindowChanged( | 63 void AppWindowContentsImpl::NativeWindowChanged( |
64 NativeAppWindow* native_app_window) { | 64 NativeAppWindow* native_app_window) { |
65 base::ListValue args; | 65 base::ListValue args; |
66 base::DictionaryValue* dictionary = new base::DictionaryValue(); | 66 base::DictionaryValue* dictionary = new base::DictionaryValue(); |
67 args.Append(dictionary); | 67 args.Append(dictionary); |
68 host_->GetSerializedState(dictionary); | 68 host_->GetSerializedState(dictionary); |
69 | 69 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 content::RenderViewHost* rvh) { | 130 content::RenderViewHost* rvh) { |
131 DCHECK(rvh); | 131 DCHECK(rvh); |
132 content::BrowserThread::PostTask( | 132 content::BrowserThread::PostTask( |
133 content::BrowserThread::IO, FROM_HERE, | 133 content::BrowserThread::IO, FROM_HERE, |
134 base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute, | 134 base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute, |
135 base::Unretained(content::ResourceDispatcherHost::Get()), | 135 base::Unretained(content::ResourceDispatcherHost::Get()), |
136 rvh->GetProcess()->GetID(), rvh->GetRoutingID())); | 136 rvh->GetProcess()->GetID(), rvh->GetRoutingID())); |
137 } | 137 } |
138 | 138 |
139 } // namespace extensions | 139 } // namespace extensions |
OLD | NEW |