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

Side by Side Diff: chrome/browser/android/compositor/tab_content_manager.h

Issue 805903005: Move WeakPtrFactory members to the end in some android code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_TAB_CONTENT_MANAGER_H_ 5 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_TAB_CONTENT_MANAGER_H_
6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_TAB_CONTENT_MANAGER_H_ 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_TAB_CONTENT_MANAGER_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 void PutThumbnailIntoCache(int tab_id, 109 void PutThumbnailIntoCache(int tab_id,
110 float thumbnail_scale, 110 float thumbnail_scale,
111 const SkBitmap& bitmap); 111 const SkBitmap& bitmap);
112 112
113 scoped_ptr<ThumbnailCache> thumbnail_cache_; 113 scoped_ptr<ThumbnailCache> thumbnail_cache_;
114 ThumbnailLayerMap static_layer_cache_; 114 ThumbnailLayerMap static_layer_cache_;
115 LayerMap live_layer_list_; 115 LayerMap live_layer_list_;
116 TabReadbackRequestMap pending_tab_readbacks_; 116 TabReadbackRequestMap pending_tab_readbacks_;
117 117
118 JavaObjectWeakGlobalRef weak_java_tab_content_manager_;
118 base::WeakPtrFactory<TabContentManager> weak_factory_; 119 base::WeakPtrFactory<TabContentManager> weak_factory_;
119 JavaObjectWeakGlobalRef weak_java_tab_content_manager_;
120 120
121 DISALLOW_COPY_AND_ASSIGN(TabContentManager); 121 DISALLOW_COPY_AND_ASSIGN(TabContentManager);
122 }; 122 };
123 123
124 bool RegisterTabContentManager(JNIEnv* env); 124 bool RegisterTabContentManager(JNIEnv* env);
125 125
126 } // namespace android 126 } // namespace android
127 } // namespace chrome 127 } // namespace chrome
128 128
129 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_TAB_CONTENT_MANAGER_H_ 129 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_TAB_CONTENT_MANAGER_H_
OLDNEW
« no previous file with comments | « android_webview/renderer/print_web_view_helper.cc ('k') | chrome/browser/android/compositor/tab_content_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698