| Index: components/web_contents_delegate_android/color_chooser_android.h
|
| diff --git a/content/components/web_contents_delegate_android/color_chooser_android.h b/components/web_contents_delegate_android/color_chooser_android.h
|
| similarity index 80%
|
| rename from content/components/web_contents_delegate_android/color_chooser_android.h
|
| rename to components/web_contents_delegate_android/color_chooser_android.h
|
| index 88cd6c35293f0ab1d0ec98600c6074f04df216b9..7b9cc1ac8231385f3961608c8e048ff1391710aa 100644
|
| --- a/content/components/web_contents_delegate_android/color_chooser_android.h
|
| +++ b/components/web_contents_delegate_android/color_chooser_android.h
|
| @@ -2,8 +2,8 @@
|
| // 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_
|
| +#ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
|
| +#define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
|
|
|
| #include "base/android/jni_android.h"
|
| #include "base/basictypes.h"
|
| @@ -14,7 +14,7 @@
|
| using base::android::AttachCurrentThread;
|
| using base::android::ScopedJavaLocalRef;
|
|
|
| -namespace content {
|
| +namespace components {
|
|
|
| // Glues the Java (ColorPickerChooser.java) picker with the native part.
|
| class ColorChooserAndroid : public content::ColorChooser,
|
| @@ -39,6 +39,6 @@ class ColorChooserAndroid : public content::ColorChooser,
|
| // Native JNI methods
|
| bool RegisterColorChooserAndroid(JNIEnv* env);
|
|
|
| -} // namespace content
|
| +} // namespace components
|
|
|
| -#endif // CONTENT_COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
|
| +#endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
|
|
|