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

Unified Diff: base/message_loop/message_loop.h

Issue 2155223002: Remove deprecated methods from MessageLoop on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_msg_loop
Patch Set: rebase Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/message_loop/message_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/message_loop/message_loop.h
diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h
index 761c18cafebca857f4541a8d93db249e01bb1d61..d8eae01dd5b27d16edb6a1c3f8d5557392f3d751 100644
--- a/base/message_loop/message_loop.h
+++ b/base/message_loop/message_loop.h
@@ -171,6 +171,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
void AddNestingObserver(NestingObserver* observer);
void RemoveNestingObserver(NestingObserver* observer);
+#if !(defined(OS_MACOSX) && !defined(OS_IOS))
// NOTE: Deprecated; prefer task_runner() and the TaskRunner interfaces.
// TODO(skyostil): Remove these functions (crbug.com/465354).
//
@@ -241,6 +242,11 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
base::subtle::ReleaseHelperInternal<T, void>::ReleaseViaSequencedTaskRunner(
this, from_here, object);
}
+#endif // !(defined(OS_MACOSX) && !defined(OS_IOS))
+
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+ protected:
+#endif // defined(OS_MACOSX) && !defined(OS_IOS)
// Deprecated: use RunLoop instead.
// Run the message loop.
@@ -251,6 +257,10 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
// Return as soon as all items that can be run are taken care of.
void RunUntilIdle();
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+ public:
+#endif // defined(OS_MACOSX) && !defined(OS_IOS)
+
// Deprecated: use RunLoop instead.
//
// Signals the Run method to return when it becomes idle. It will continue to
@@ -545,6 +555,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
// Id of the thread this message loop is bound to.
PlatformThreadId thread_id_;
+#if !(defined(OS_MACOSX) && !defined(OS_IOS))
template <class T, class R> friend class base::subtle::DeleteHelperInternal;
template <class T, class R> friend class base::subtle::ReleaseHelperInternal;
@@ -554,6 +565,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
void ReleaseSoonInternal(const tracked_objects::Location& from_here,
void(*releaser)(const void*),
const void* object);
+#endif // !(defined(OS_MACOSX) && !defined(OS_IOS))
DISALLOW_COPY_AND_ASSIGN(MessageLoop);
};
@@ -569,6 +581,9 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
//
class BASE_EXPORT MessageLoopForUI : public MessageLoop {
public:
+ using MessageLoop::Run;
+ using MessageLoop::RunUntilIdle;
+
MessageLoopForUI() : MessageLoop(TYPE_UI) {
}
@@ -629,6 +644,9 @@ static_assert(sizeof(MessageLoop) == sizeof(MessageLoopForUI),
//
class BASE_EXPORT MessageLoopForIO : public MessageLoop {
public:
+ using MessageLoop::Run;
+ using MessageLoop::RunUntilIdle;
+
MessageLoopForIO() : MessageLoop(TYPE_IO) {
}
« no previous file with comments | « no previous file | base/message_loop/message_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698