Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Side by Side Diff: base/message_loop/message_loop.cc

Issue 2169553002: Properly throw java exceptions from shouldOverrideUrlLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Better separation of production and test code, and minor cleanups. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 // MessageLoopForUI 710 // MessageLoopForUI
711 711
712 MessageLoopForUI::MessageLoopForUI(std::unique_ptr<MessagePump> pump) 712 MessageLoopForUI::MessageLoopForUI(std::unique_ptr<MessagePump> pump)
713 : MessageLoop(TYPE_UI, Bind(&ReturnPump, Passed(&pump))) {} 713 : MessageLoop(TYPE_UI, Bind(&ReturnPump, Passed(&pump))) {}
714 714
715 #if defined(OS_ANDROID) 715 #if defined(OS_ANDROID)
716 void MessageLoopForUI::Start() { 716 void MessageLoopForUI::Start() {
717 // No Histogram support for UI message loop as it is managed by Java side 717 // No Histogram support for UI message loop as it is managed by Java side
718 static_cast<MessagePumpForUI*>(pump_.get())->Start(this); 718 static_cast<MessagePumpForUI*>(pump_.get())->Start(this);
719 } 719 }
720
721 void MessageLoopForUI::StartForTesting(WaitableEvent* test_done_event) {
722 // No Histogram support for UI message loop as it is managed by Java side
723 static_cast<MessagePumpForUI*>(pump_.get())
724 ->StartForTesting(this, test_done_event);
725 }
726
727 void MessageLoopForUI::Abort() {
728 static_cast<MessagePumpForUI*>(pump_.get())->Abort();
729 }
720 #endif 730 #endif
721 731
722 #if defined(OS_IOS) 732 #if defined(OS_IOS)
723 void MessageLoopForUI::Attach() { 733 void MessageLoopForUI::Attach() {
724 static_cast<MessagePumpUIApplication*>(pump_.get())->Attach(this); 734 static_cast<MessagePumpUIApplication*>(pump_.get())->Attach(this);
725 } 735 }
726 #endif 736 #endif
727 737
728 #if defined(USE_OZONE) || (defined(USE_X11) && !defined(USE_GLIB)) 738 #if defined(USE_OZONE) || (defined(USE_X11) && !defined(USE_GLIB))
729 bool MessageLoopForUI::WatchFileDescriptor( 739 bool MessageLoopForUI::WatchFileDescriptor(
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 persistent, 781 persistent,
772 mode, 782 mode,
773 controller, 783 controller,
774 delegate); 784 delegate);
775 } 785 }
776 #endif 786 #endif
777 787
778 #endif // !defined(OS_NACL_SFI) 788 #endif // !defined(OS_NACL_SFI)
779 789
780 } // namespace base 790 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698