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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
398 void ExtensionHost::DocumentOnLoadCompletedInMainFrame(RenderViewHost* rvh, | 398 void ExtensionHost::DocumentOnLoadCompletedInMainFrame(RenderViewHost* rvh, |
399 int32 page_id) { | 399 int32 page_id) { |
400 if (ViewType::EXTENSION_POPUP == GetRenderViewType()) { | 400 if (ViewType::EXTENSION_POPUP == GetRenderViewType()) { |
401 NotificationService::current()->Notify( | 401 NotificationService::current()->Notify( |
402 NotificationType::EXTENSION_POPUP_VIEW_READY, | 402 NotificationType::EXTENSION_POPUP_VIEW_READY, |
403 Source<Profile>(profile_), | 403 Source<Profile>(profile_), |
404 Details<ExtensionHost>(this)); | 404 Details<ExtensionHost>(this)); |
405 } | 405 } |
406 } | 406 } |
407 | 407 |
408 void ExtensionHost::RunJavaScriptMessage(const std::wstring& message, | 408 void ExtensionHost::RunJavaScriptMessage(const RenderViewHost* rvh, |
| 409 const std::wstring& message, |
409 const std::wstring& default_prompt, | 410 const std::wstring& default_prompt, |
410 const GURL& frame_url, | 411 const GURL& frame_url, |
411 const int flags, | 412 const int flags, |
412 IPC::Message* reply_msg, | 413 IPC::Message* reply_msg, |
413 bool* did_suppress_message) { | 414 bool* did_suppress_message) { |
414 base::TimeDelta time_since_last_message( | 415 base::TimeDelta time_since_last_message( |
415 base::TimeTicks::Now() - last_javascript_message_dismissal_); | 416 base::TimeTicks::Now() - last_javascript_message_dismissal_); |
416 | 417 |
417 *did_suppress_message = suppress_javascript_messages_; | 418 *did_suppress_message = suppress_javascript_messages_; |
418 if (!suppress_javascript_messages_) { | 419 if (!suppress_javascript_messages_) { |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
799 return window_id; | 800 return window_id; |
800 } | 801 } |
801 | 802 |
802 void ExtensionHost::OnRunFileChooser( | 803 void ExtensionHost::OnRunFileChooser( |
803 const ViewHostMsg_RunFileChooser_Params& params) { | 804 const ViewHostMsg_RunFileChooser_Params& params) { |
804 if (file_select_helper_.get() == NULL) | 805 if (file_select_helper_.get() == NULL) |
805 file_select_helper_.reset(new FileSelectHelper(profile())); | 806 file_select_helper_.reset(new FileSelectHelper(profile())); |
806 file_select_helper_->RunFileChooser(render_view_host_, | 807 file_select_helper_->RunFileChooser(render_view_host_, |
807 GetAssociatedTabContents(), params); | 808 GetAssociatedTabContents(), params); |
808 } | 809 } |
OLD | NEW |