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

Side by Side Diff: chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc

Issue 1371523003: Android: Don't destroy LayerTreeHost when Surface goes away (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/android/compositor/scene_layer/tab_strip_scene_layer.h" 5 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "cc/resources/scoped_ui_resource.h"
8 #include "chrome/browser/android/compositor/layer/tab_handle_layer.h" 9 #include "chrome/browser/android/compositor/layer/tab_handle_layer.h"
9 #include "chrome/browser/android/compositor/layer_title_cache.h" 10 #include "chrome/browser/android/compositor/layer_title_cache.h"
10 #include "content/public/browser/android/compositor.h" 11 #include "content/public/browser/android/compositor.h"
11 #include "jni/TabStripSceneLayer_jni.h" 12 #include "jni/TabStripSceneLayer_jni.h"
12 #include "ui/android/resources/resource_manager_impl.h" 13 #include "ui/android/resources/resource_manager_impl.h"
13 #include "ui/android/resources/ui_resource_android.h"
14 14
15 namespace chrome { 15 namespace chrome {
16 namespace android { 16 namespace android {
17 17
18 TabStripSceneLayer::TabStripSceneLayer(JNIEnv* env, jobject jobj) 18 TabStripSceneLayer::TabStripSceneLayer(JNIEnv* env, jobject jobj)
19 : SceneLayer(env, jobj), 19 : SceneLayer(env, jobj),
20 tab_strip_layer_( 20 tab_strip_layer_(
21 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())), 21 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
22 new_tab_button_( 22 new_tab_button_(
23 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), 23 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 TabStripSceneLayer* scene_layer = new TabStripSceneLayer(env, jobj); 221 TabStripSceneLayer* scene_layer = new TabStripSceneLayer(env, jobj);
222 return reinterpret_cast<intptr_t>(scene_layer); 222 return reinterpret_cast<intptr_t>(scene_layer);
223 } 223 }
224 224
225 bool RegisterTabStripSceneLayer(JNIEnv* env) { 225 bool RegisterTabStripSceneLayer(JNIEnv* env) {
226 return RegisterNativesImpl(env); 226 return RegisterNativesImpl(env);
227 } 227 }
228 228
229 } // namespace android 229 } // namespace android
230 } // namespace chrome 230 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/android/compositor/layer/toolbar_layer.cc ('k') | chrome/browser/android/compositor/tab_content_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698