OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_view_host.h" | 5 #include "content/browser/renderer_host/render_view_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
993 FilterURL(policy, renderer_id, &validated_params.password_form.action); | 993 FilterURL(policy, renderer_id, &validated_params.password_form.action); |
994 | 994 |
995 delegate_->DidNavigate(this, validated_params); | 995 delegate_->DidNavigate(this, validated_params); |
996 } | 996 } |
997 | 997 |
998 void RenderViewHost::OnMsgUpdateState(int32 page_id, | 998 void RenderViewHost::OnMsgUpdateState(int32 page_id, |
999 const std::string& state) { | 999 const std::string& state) { |
1000 delegate_->UpdateState(this, page_id, state); | 1000 delegate_->UpdateState(this, page_id, state); |
1001 } | 1001 } |
1002 | 1002 |
1003 void RenderViewHost::OnMsgUpdateTitle(int32 page_id, | 1003 void RenderViewHost::OnMsgUpdateTitle( |
1004 const std::wstring& title) { | 1004 int32 page_id, |
| 1005 const string16& title, |
| 1006 WebKit::WebTextDirection title_direction) { |
1005 if (title.length() > content::kMaxTitleChars) { | 1007 if (title.length() > content::kMaxTitleChars) { |
1006 NOTREACHED() << "Renderer sent too many characters in title."; | 1008 NOTREACHED() << "Renderer sent too many characters in title."; |
1007 return; | 1009 return; |
1008 } | 1010 } |
1009 delegate_->UpdateTitle(this, page_id, title); | 1011 |
| 1012 delegate_->UpdateTitle(this, page_id, title, title_direction); |
1010 } | 1013 } |
1011 | 1014 |
1012 void RenderViewHost::OnMsgUpdateEncoding(const std::string& encoding_name) { | 1015 void RenderViewHost::OnMsgUpdateEncoding(const std::string& encoding_name) { |
1013 delegate_->UpdateEncoding(this, encoding_name); | 1016 delegate_->UpdateEncoding(this, encoding_name); |
1014 } | 1017 } |
1015 | 1018 |
1016 void RenderViewHost::OnMsgUpdateTargetURL(int32 page_id, | 1019 void RenderViewHost::OnMsgUpdateTargetURL(int32 page_id, |
1017 const GURL& url) { | 1020 const GURL& url) { |
1018 delegate_->UpdateTargetURL(page_id, url); | 1021 delegate_->UpdateTargetURL(page_id, url); |
1019 | 1022 |
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1621 LOG(DFATAL) << "Invalid checked state " << checked_state; | 1624 LOG(DFATAL) << "Invalid checked state " << checked_state; |
1622 return; | 1625 return; |
1623 } | 1626 } |
1624 | 1627 |
1625 CommandState state; | 1628 CommandState state; |
1626 state.is_enabled = is_enabled; | 1629 state.is_enabled = is_enabled; |
1627 state.checked_state = | 1630 state.checked_state = |
1628 static_cast<RenderViewCommandCheckedState>(checked_state); | 1631 static_cast<RenderViewCommandCheckedState>(checked_state); |
1629 command_states_[static_cast<RenderViewCommand>(command)] = state; | 1632 command_states_[static_cast<RenderViewCommand>(command)] = state; |
1630 } | 1633 } |
OLD | NEW |