| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 renderer_process_handle = GetCurrentProcess(); | 196 renderer_process_handle = GetCurrentProcess(); |
| 197 | 197 |
| 198 BOOL result = DuplicateHandle(GetCurrentProcess(), | 198 BOOL result = DuplicateHandle(GetCurrentProcess(), |
| 199 modal_dialog_event_->handle(), | 199 modal_dialog_event_->handle(), |
| 200 renderer_process_handle, | 200 renderer_process_handle, |
| 201 &modal_dialog_event_handle, | 201 &modal_dialog_event_handle, |
| 202 SYNCHRONIZE, | 202 SYNCHRONIZE, |
| 203 FALSE, | 203 FALSE, |
| 204 0); | 204 0); |
| 205 DCHECK(result) << | 205 DCHECK(result) << |
| 206 "Couldn't duplicate the modal dialog handle for the renderer."; | 206 "Couldn't duplicate the modal dialog handle for the renderer: " << |
| 207 GetLastError(); |
| 207 #endif | 208 #endif |
| 208 | 209 |
| 209 ModalDialogEvent modal_dialog_event; | 210 ModalDialogEvent modal_dialog_event; |
| 210 #if defined(OS_WIN) | 211 #if defined(OS_WIN) |
| 211 modal_dialog_event.event = modal_dialog_event_handle; | 212 modal_dialog_event.event = modal_dialog_event_handle; |
| 212 #endif | 213 #endif |
| 213 | 214 |
| 214 // Force local storage to be enabled for extensions. This is so that we can | 215 // Force local storage to be enabled for extensions. This is so that we can |
| 215 // enable extensions by default before databases, if necessary. | 216 // enable extensions by default before databases, if necessary. |
| 216 // TODO(aa): This should be removed when local storage and databases are | 217 // TODO(aa): This should be removed when local storage and databases are |
| (...skipping 1476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1693 } | 1694 } |
| 1694 | 1695 |
| 1695 void RenderViewHost::ResetModalDialogEvent() { | 1696 void RenderViewHost::ResetModalDialogEvent() { |
| 1696 if (--modal_dialog_count_ == 0) | 1697 if (--modal_dialog_count_ == 0) |
| 1697 modal_dialog_event_->Reset(); | 1698 modal_dialog_event_->Reset(); |
| 1698 } | 1699 } |
| 1699 | 1700 |
| 1700 void RenderViewHost::UpdateBrowserWindowId(int window_id) { | 1701 void RenderViewHost::UpdateBrowserWindowId(int window_id) { |
| 1701 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id)); | 1702 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id)); |
| 1702 } | 1703 } |
| OLD | NEW |