OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1519 void RenderView::AddGURLSearchProvider(const GURL& osd_url, bool autodetected) { | 1519 void RenderView::AddGURLSearchProvider(const GURL& osd_url, bool autodetected) { |
1520 if (!osd_url.is_empty()) | 1520 if (!osd_url.is_empty()) |
1521 Send(new ViewHostMsg_PageHasOSDD(routing_id_, page_id_, osd_url, | 1521 Send(new ViewHostMsg_PageHasOSDD(routing_id_, page_id_, osd_url, |
1522 autodetected)); | 1522 autodetected)); |
1523 } | 1523 } |
1524 | 1524 |
1525 void RenderView::OnAutoFillSuggestionsReturned( | 1525 void RenderView::OnAutoFillSuggestionsReturned( |
1526 int query_id, | 1526 int query_id, |
1527 const std::vector<string16>& values, | 1527 const std::vector<string16>& values, |
1528 const std::vector<string16>& labels, | 1528 const std::vector<string16>& labels, |
| 1529 const std::vector<string16>& icons, |
1529 const std::vector<int>& unique_ids) { | 1530 const std::vector<int>& unique_ids) { |
1530 autofill_helper_.SuggestionsReceived(query_id, values, labels, unique_ids); | 1531 autofill_helper_.SuggestionsReceived( |
| 1532 query_id, values, labels, icons, unique_ids); |
1531 } | 1533 } |
1532 | 1534 |
1533 void RenderView::OnAutoFillFormDataFilled(int query_id, | 1535 void RenderView::OnAutoFillFormDataFilled(int query_id, |
1534 const webkit_glue::FormData& form) { | 1536 const webkit_glue::FormData& form) { |
1535 autofill_helper_.FormDataFilled(query_id, form); | 1537 autofill_helper_.FormDataFilled(query_id, form); |
1536 } | 1538 } |
1537 | 1539 |
1538 void RenderView::OnAllowScriptToClose(bool script_can_close) { | 1540 void RenderView::OnAllowScriptToClose(bool script_can_close) { |
1539 script_can_close_ = script_can_close; | 1541 script_can_close_ = script_can_close; |
1540 } | 1542 } |
(...skipping 3673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5214 // the origins of the two domains are different. This can be treated as a | 5216 // the origins of the two domains are different. This can be treated as a |
5215 // top level navigation and routed back to the host. | 5217 // top level navigation and routed back to the host. |
5216 WebKit::WebFrame* opener = frame->opener(); | 5218 WebKit::WebFrame* opener = frame->opener(); |
5217 if (opener) { | 5219 if (opener) { |
5218 if (url.GetOrigin() != GURL(opener->url()).GetOrigin()) | 5220 if (url.GetOrigin() != GURL(opener->url()).GetOrigin()) |
5219 return true; | 5221 return true; |
5220 } | 5222 } |
5221 } | 5223 } |
5222 return false; | 5224 return false; |
5223 } | 5225 } |
OLD | NEW |