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

Unified Diff: content/components/web_contents_delegate_android/color_chooser_android.h

Issue 11823046: Move content/components/web_contents_delegate_android to components/web_contents_delegate_android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase (win7_aura so slow!!) Created 7 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 side-by-side diff with in-line comments
Download patch
Index: content/components/web_contents_delegate_android/color_chooser_android.h
diff --git a/content/components/web_contents_delegate_android/color_chooser_android.h b/content/components/web_contents_delegate_android/color_chooser_android.h
deleted file mode 100644
index 88cd6c35293f0ab1d0ec98600c6074f04df216b9..0000000000000000000000000000000000000000
--- a/content/components/web_contents_delegate_android/color_chooser_android.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CONTENT_COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
-#define CONTENT_COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
-
-#include "base/android/jni_android.h"
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "content/public/browser/color_chooser.h"
-#include "content/public/browser/web_contents_observer.h"
-
-using base::android::AttachCurrentThread;
-using base::android::ScopedJavaLocalRef;
-
-namespace content {
-
-// Glues the Java (ColorPickerChooser.java) picker with the native part.
-class ColorChooserAndroid : public content::ColorChooser,
- public content::WebContentsObserver {
- public:
- ColorChooserAndroid(int identifier, content::WebContents* tab,
- SkColor initial_color);
- virtual ~ColorChooserAndroid();
-
- void OnColorChosen(JNIEnv* env, jobject obj, jint color);
-
- // ColorChooser interface
- virtual void End() OVERRIDE;
- virtual void SetSelectedColor(SkColor color) OVERRIDE;
-
- private:
- base::android::ScopedJavaGlobalRef<jobject> j_color_chooser_;
-
- DISALLOW_COPY_AND_ASSIGN(ColorChooserAndroid);
-};
-
-// Native JNI methods
-bool RegisterColorChooserAndroid(JNIEnv* env);
-
-} // namespace content
-
-#endif // CONTENT_COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698