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

Side by Side Diff: content/browser/android/content_view_statics.cc

Issue 691783003: [WIP NOT FOR COMMIT] Switch Android to libc++ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 6 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <jni.h> 5 #include <jni.h>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 host->Send(new ViewMsg_SetWebKitSharedTimersSuspended(false)); 76 host->Send(new ViewMsg_SetWebKitSharedTimersSuspended(false));
77 } 77 }
78 suspended_processes_.clear(); 78 suspended_processes_.clear();
79 } 79 }
80 80
81 private: 81 private:
82 void StopWatching(content::RenderProcessHost* host) { 82 void StopWatching(content::RenderProcessHost* host) {
83 std::vector<int>::iterator pos = std::find(suspended_processes_.begin(), 83 std::vector<int>::iterator pos = std::find(suspended_processes_.begin(),
84 suspended_processes_.end(), 84 suspended_processes_.end(),
85 host->GetID()); 85 host->GetID());
86 DCHECK_NE(pos, suspended_processes_.end()); 86 // DCHECK_NE(pos, suspended_processes_.end());
pasko 2014/10/30 15:20:31 DCHECK(pos != suspended_processes_.end())
Fabrice (no longer in Chrome) 2014/10/30 17:32:53 Done.
87 host->RemoveObserver(this); 87 host->RemoveObserver(this);
88 suspended_processes_.erase(pos); 88 suspended_processes_.erase(pos);
89 } 89 }
90 90
91 std::vector<int /* RenderProcessHost id */> suspended_processes_; 91 std::vector<int /* RenderProcessHost id */> suspended_processes_;
92 }; 92 };
93 93
94 base::LazyInstance<SuspendedProcessWatcher> g_suspended_processes_watcher = 94 base::LazyInstance<SuspendedProcessWatcher> g_suspended_processes_watcher =
95 LAZY_INSTANCE_INITIALIZER; 95 LAZY_INSTANCE_INITIALIZER;
96 96
(...skipping 18 matching lines...) Expand all
115 } 115 }
116 } 116 }
117 117
118 namespace content { 118 namespace content {
119 119
120 bool RegisterWebViewStatics(JNIEnv* env) { 120 bool RegisterWebViewStatics(JNIEnv* env) {
121 return RegisterNativesImpl(env); 121 return RegisterNativesImpl(env);
122 } 122 }
123 123
124 } // namespace content 124 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698