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

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

Issue 629183002: Replacing the OVERRIDE with override and FINAL with final in content/browser/android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolving Error in android Created 6 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 (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 "content/browser/android/content_view_render_view.h" 5 #include "content/browser/android/content_view_render_view.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 18 matching lines...) Expand all
29 namespace content { 29 namespace content {
30 30
31 namespace { 31 namespace {
32 32
33 class LayerTreeBuildHelperImpl : public LayerTreeBuildHelper { 33 class LayerTreeBuildHelperImpl : public LayerTreeBuildHelper {
34 public: 34 public:
35 LayerTreeBuildHelperImpl() {} 35 LayerTreeBuildHelperImpl() {}
36 virtual ~LayerTreeBuildHelperImpl() {} 36 virtual ~LayerTreeBuildHelperImpl() {}
37 37
38 virtual scoped_refptr<cc::Layer> GetLayerTree( 38 virtual scoped_refptr<cc::Layer> GetLayerTree(
39 scoped_refptr<cc::Layer> content_root_layer) OVERRIDE { 39 scoped_refptr<cc::Layer> content_root_layer) override {
40 return content_root_layer; 40 return content_root_layer;
41 } 41 }
42 42
43 private: 43 private:
44 DISALLOW_COPY_AND_ASSIGN(LayerTreeBuildHelperImpl); 44 DISALLOW_COPY_AND_ASSIGN(LayerTreeBuildHelperImpl);
45 }; 45 };
46 46
47 } // anonymous namespace 47 } // anonymous namespace
48 48
49 // static 49 // static
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 compositor_.reset(Compositor::Create(this, root_window_)); 145 compositor_.reset(Compositor::Create(this, root_window_));
146 } 146 }
147 147
148 jlong ContentViewRenderView::GetUIResourceProvider(JNIEnv* env, 148 jlong ContentViewRenderView::GetUIResourceProvider(JNIEnv* env,
149 jobject obj) { 149 jobject obj) {
150 if (!compositor_) 150 if (!compositor_)
151 return 0; 151 return 0;
152 return reinterpret_cast<intptr_t>(&compositor_->GetUIResourceProvider()); 152 return reinterpret_cast<intptr_t>(&compositor_->GetUIResourceProvider());
153 } 153 }
154 } // namespace content 154 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_view_render_view.h ('k') | content/browser/android/content_view_statics.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698