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/extensions/extension_host.h" | 5 #include "chrome/browser/extensions/extension_host.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 | 8 |
9 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 void ExtensionHost::DocumentOnLoadCompletedInMainFrame(RenderViewHost* rvh, | 418 void ExtensionHost::DocumentOnLoadCompletedInMainFrame(RenderViewHost* rvh, |
419 int32 page_id) { | 419 int32 page_id) { |
420 if (ViewType::EXTENSION_POPUP == GetRenderViewType()) { | 420 if (ViewType::EXTENSION_POPUP == GetRenderViewType()) { |
421 NotificationService::current()->Notify( | 421 NotificationService::current()->Notify( |
422 NotificationType::EXTENSION_POPUP_VIEW_READY, | 422 NotificationType::EXTENSION_POPUP_VIEW_READY, |
423 Source<Profile>(profile_), | 423 Source<Profile>(profile_), |
424 Details<ExtensionHost>(this)); | 424 Details<ExtensionHost>(this)); |
425 } | 425 } |
426 } | 426 } |
427 | 427 |
428 void ExtensionHost::RunJavaScriptMessage(const std::wstring& message, | 428 void ExtensionHost::RunJavaScriptMessage(const RenderViewHost* rvh, |
| 429 const std::wstring& message, |
429 const std::wstring& default_prompt, | 430 const std::wstring& default_prompt, |
430 const GURL& frame_url, | 431 const GURL& frame_url, |
431 const int flags, | 432 const int flags, |
432 IPC::Message* reply_msg, | 433 IPC::Message* reply_msg, |
433 bool* did_suppress_message) { | 434 bool* did_suppress_message) { |
434 base::TimeDelta time_since_last_message( | 435 base::TimeDelta time_since_last_message( |
435 base::TimeTicks::Now() - last_javascript_message_dismissal_); | 436 base::TimeTicks::Now() - last_javascript_message_dismissal_); |
436 | 437 |
437 *did_suppress_message = suppress_javascript_messages_; | 438 *did_suppress_message = suppress_javascript_messages_; |
438 if (!suppress_javascript_messages_) { | 439 if (!suppress_javascript_messages_) { |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
832 return window_id; | 833 return window_id; |
833 } | 834 } |
834 | 835 |
835 void ExtensionHost::OnRunFileChooser( | 836 void ExtensionHost::OnRunFileChooser( |
836 const ViewHostMsg_RunFileChooser_Params& params) { | 837 const ViewHostMsg_RunFileChooser_Params& params) { |
837 if (file_select_helper_.get() == NULL) | 838 if (file_select_helper_.get() == NULL) |
838 file_select_helper_.reset(new FileSelectHelper(profile())); | 839 file_select_helper_.reset(new FileSelectHelper(profile())); |
839 file_select_helper_->RunFileChooser(render_view_host_, | 840 file_select_helper_->RunFileChooser(render_view_host_, |
840 associated_tab_contents(), params); | 841 associated_tab_contents(), params); |
841 } | 842 } |
OLD | NEW |