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

Unified Diff: ui/base/android/window_android.cc

Issue 929903002: Remove cc dependency from ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes in ui/PRESUBMIT.py Created 5 years, 10 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 | « ui/base/android/window_android.h ('k') | ui/base/android/window_android_compositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/android/window_android.cc
diff --git a/ui/base/android/window_android.cc b/ui/base/android/window_android.cc
deleted file mode 100644
index 2fea4f1c00dc5f02dbc79d21f99727fae636778d..0000000000000000000000000000000000000000
--- a/ui/base/android/window_android.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/base/android/window_android.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_array.h"
-#include "base/android/jni_weak_ref.h"
-#include "base/android/scoped_java_ref.h"
-#include "jni/WindowAndroid_jni.h"
-#include "ui/base/android/window_android_compositor.h"
-#include "ui/base/android/window_android_observer.h"
-
-namespace ui {
-
-using base::android::AttachCurrentThread;
-using base::android::ScopedJavaLocalRef;
-
-WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj)
- : weak_java_window_(env, obj), compositor_(NULL) {
-}
-
-void WindowAndroid::Destroy(JNIEnv* env, jobject obj) {
- delete this;
-}
-
-ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() {
- return weak_java_window_.get(AttachCurrentThread());
-}
-
-bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-WindowAndroid::~WindowAndroid() {
- DCHECK(!compositor_);
-}
-
-void WindowAndroid::OnCompositingDidCommit() {
- FOR_EACH_OBSERVER(WindowAndroidObserver,
- observer_list_,
- OnCompositingDidCommit());
-}
-
-void WindowAndroid::AddObserver(WindowAndroidObserver* observer) {
- if (!observer_list_.HasObserver(observer))
- observer_list_.AddObserver(observer);
-}
-
-void WindowAndroid::RemoveObserver(WindowAndroidObserver* observer) {
- observer_list_.RemoveObserver(observer);
-}
-
-void WindowAndroid::AttachCompositor(WindowAndroidCompositor* compositor) {
- if (compositor_ && compositor != compositor_)
- DetachCompositor();
-
- compositor_ = compositor;
- FOR_EACH_OBSERVER(WindowAndroidObserver,
- observer_list_,
- OnAttachCompositor());
-}
-
-void WindowAndroid::DetachCompositor() {
- compositor_ = NULL;
- FOR_EACH_OBSERVER(WindowAndroidObserver,
- observer_list_,
- OnDetachCompositor());
- observer_list_.Clear();
-}
-
-void WindowAndroid::RequestVSyncUpdate() {
- JNIEnv* env = AttachCurrentThread();
- Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject().obj());
-}
-
-void WindowAndroid::SetNeedsAnimate() {
- if (compositor_)
- compositor_->SetNeedsAnimate();
-}
-
-void WindowAndroid::Animate(base::TimeTicks begin_frame_time) {
- FOR_EACH_OBSERVER(
- WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time));
-}
-
-void WindowAndroid::OnVSync(JNIEnv* env,
- jobject obj,
- jlong time_micros,
- jlong period_micros) {
- base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros));
- base::TimeDelta vsync_period(
- base::TimeDelta::FromMicroseconds(period_micros));
- FOR_EACH_OBSERVER(
- WindowAndroidObserver,
- observer_list_,
- OnVSync(frame_time, vsync_period));
- if (compositor_)
- compositor_->OnVSync(frame_time, vsync_period);
-}
-
-// ----------------------------------------------------------------------------
-// Native JNI methods
-// ----------------------------------------------------------------------------
-
-jlong Init(JNIEnv* env, jobject obj) {
- WindowAndroid* window = new WindowAndroid(env, obj);
- return reinterpret_cast<intptr_t>(window);
-}
-
-} // namespace ui
« no previous file with comments | « ui/base/android/window_android.h ('k') | ui/base/android/window_android_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698