diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 00:23:34 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 00:23:34 +0000 |
| commit | a1f42985d74de36d1fc4fc173b9f2f7da4391d12 (patch) | |
| tree | 140ad42c9d736bdd3002fe3df7fe507df63af262 /chrome/browser/renderer_host/render_view_host.cc | |
| parent | fc2d3fced2e685464564407b14e57077cad3250e (diff) | |
| download | chromium_src-a1f42985d74de36d1fc4fc173b9f2f7da4391d12.zip chromium_src-a1f42985d74de36d1fc4fc173b9f2f7da4391d12.tar.gz chromium_src-a1f42985d74de36d1fc4fc173b9f2f7da4391d12.tar.bz2 | |
Revert change 26184, 26181 and 26178 to fix
the compile error on the toolkit builder.
TBR:finnur
Review URL: http://codereview.chromium.org/203064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/render_view_host.cc')
| -rw-r--r-- | chrome/browser/renderer_host/render_view_host.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 6d92b81..bab8ac8 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -510,10 +510,8 @@ void RenderViewHost::ExecuteJavascriptInWebFrame( } void RenderViewHost::InsertCSSInWebFrame( - const std::wstring& frame_xpath, - const std::string& css, - const std::string& id) { - Send(new ViewMsg_CSSInsertRequest(routing_id(), frame_xpath, css, id)); + const std::wstring& frame_xpath, const std::string& css) { + Send(new ViewMsg_CSSInsertRequest(routing_id(), frame_xpath, css)); } void RenderViewHost::AddMessageToConsole( @@ -613,7 +611,7 @@ void RenderViewHost::JavaScriptMessageBoxClosed(IPC::Message* reply_msg, } void RenderViewHost::JavaScriptMessageBoxWindowDestroyed() { - ResetModalDialogEvent(); + ResetModalDialogEvent(); } void RenderViewHost::ModalHTMLDialogClosed(IPC::Message* reply_msg, @@ -1113,7 +1111,7 @@ void RenderViewHost::OnMsgFindReply(int request_id, void RenderViewHost::OnDeterminePageTextReply( const std::wstring& page_text) { -#if defined(OS_WIN) // Only for windows. +#if defined(OS_WIN) // Only for windows. int num_languages = 0; bool is_reliable = false; const char* language_iso_code = LanguageCodeISO639_1( @@ -1673,8 +1671,8 @@ void RenderViewHost::SignalModalDialogEvent() { } void RenderViewHost::ResetModalDialogEvent() { - if (--modal_dialog_count_ == 0) - modal_dialog_event_->Reset(); + if (--modal_dialog_count_ == 0) + modal_dialog_event_->Reset(); } void RenderViewHost::UpdateBrowserWindowId(int window_id) { |