| 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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 NOTREACHED(); | 407 NOTREACHED(); |
| 408 params.action = ViewMsg_StopFinding_Params::kKeepSelection; | 408 params.action = ViewMsg_StopFinding_Params::kKeepSelection; |
| 409 } | 409 } |
| 410 Send(new ViewMsg_StopFinding(routing_id(), params)); | 410 Send(new ViewMsg_StopFinding(routing_id(), params)); |
| 411 } | 411 } |
| 412 | 412 |
| 413 void RenderViewHost::Zoom(PageZoom::Function function) { | 413 void RenderViewHost::Zoom(PageZoom::Function function) { |
| 414 Send(new ViewMsg_Zoom(routing_id(), function)); | 414 Send(new ViewMsg_Zoom(routing_id(), function)); |
| 415 } | 415 } |
| 416 | 416 |
| 417 void RenderViewHost::SetZoomLevel(double zoom_level) { | 417 void RenderViewHost::SetZoomLevel(int request_id, double zoom_level) { |
| 418 Send(new ViewMsg_SetZoomLevel(routing_id(), zoom_level)); | 418 Send(new ViewMsg_SetZoomLevel(routing_id(), request_id, zoom_level)); |
| 419 } | 419 } |
| 420 | 420 |
| 421 void RenderViewHost::SetPageEncoding(const std::string& encoding_name) { | 421 void RenderViewHost::SetPageEncoding(const std::string& encoding_name) { |
| 422 Send(new ViewMsg_SetPageEncoding(routing_id(), encoding_name)); | 422 Send(new ViewMsg_SetPageEncoding(routing_id(), encoding_name)); |
| 423 } | 423 } |
| 424 | 424 |
| 425 void RenderViewHost::ResetPageEncodingToDefault() { | 425 void RenderViewHost::ResetPageEncodingToDefault() { |
| 426 Send(new ViewMsg_ResetPageEncodingToDefault(routing_id())); | 426 Send(new ViewMsg_ResetPageEncodingToDefault(routing_id())); |
| 427 } | 427 } |
| 428 | 428 |
| (...skipping 1286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1715 LOG(DFATAL) << "Invalid checked state " << checked_state; | 1715 LOG(DFATAL) << "Invalid checked state " << checked_state; |
| 1716 return; | 1716 return; |
| 1717 } | 1717 } |
| 1718 | 1718 |
| 1719 CommandState state; | 1719 CommandState state; |
| 1720 state.is_enabled = is_enabled; | 1720 state.is_enabled = is_enabled; |
| 1721 state.checked_state = | 1721 state.checked_state = |
| 1722 static_cast<RenderViewCommandCheckedState>(checked_state); | 1722 static_cast<RenderViewCommandCheckedState>(checked_state); |
| 1723 command_states_[static_cast<RenderViewCommand>(command)] = state; | 1723 command_states_[static_cast<RenderViewCommand>(command)] = state; |
| 1724 } | 1724 } |
| OLD | NEW |