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 "chrome/browser/renderer_host/render_view_host.h" | 5 #include "chrome/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 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
859 view->CreateNewWindow(route_id, params); | 859 view->CreateNewWindow(route_id, params); |
860 } | 860 } |
861 | 861 |
862 void RenderViewHost::CreateNewWidget(int route_id, | 862 void RenderViewHost::CreateNewWidget(int route_id, |
863 WebKit::WebPopupType popup_type) { | 863 WebKit::WebPopupType popup_type) { |
864 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); | 864 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); |
865 if (view) | 865 if (view) |
866 view->CreateNewWidget(route_id, popup_type); | 866 view->CreateNewWidget(route_id, popup_type); |
867 } | 867 } |
868 | 868 |
869 void RenderViewHost::CreateNewFullscreenWidget( | 869 void RenderViewHost::CreateNewFullscreenWidget(int route_id) { |
870 int route_id, WebKit::WebPopupType popup_type) { | |
871 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); | 870 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); |
872 if (view) | 871 if (view) |
873 view->CreateNewFullscreenWidget(route_id, popup_type); | 872 view->CreateNewFullscreenWidget(route_id); |
874 } | 873 } |
875 | 874 |
876 void RenderViewHost::OnMsgShowView(int route_id, | 875 void RenderViewHost::OnMsgShowView(int route_id, |
877 WindowOpenDisposition disposition, | 876 WindowOpenDisposition disposition, |
878 const gfx::Rect& initial_pos, | 877 const gfx::Rect& initial_pos, |
879 bool user_gesture) { | 878 bool user_gesture) { |
880 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); | 879 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); |
881 if (view) { | 880 if (view) { |
882 view->ShowCreatedWindow(route_id, disposition, initial_pos, user_gesture); | 881 view->ShowCreatedWindow(route_id, disposition, initial_pos, user_gesture); |
883 Send(new ViewMsg_Move_ACK(route_id)); | 882 Send(new ViewMsg_Move_ACK(route_id)); |
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1715 LOG(DFATAL) << "Invalid checked state " << checked_state; | 1714 LOG(DFATAL) << "Invalid checked state " << checked_state; |
1716 return; | 1715 return; |
1717 } | 1716 } |
1718 | 1717 |
1719 CommandState state; | 1718 CommandState state; |
1720 state.is_enabled = is_enabled; | 1719 state.is_enabled = is_enabled; |
1721 state.checked_state = | 1720 state.checked_state = |
1722 static_cast<RenderViewCommandCheckedState>(checked_state); | 1721 static_cast<RenderViewCommandCheckedState>(checked_state); |
1723 command_states_[static_cast<RenderViewCommand>(command)] = state; | 1722 command_states_[static_cast<RenderViewCommand>(command)] = state; |
1724 } | 1723 } |
OLD | NEW |