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

Side by Side Diff: components/web_contents_delegate_android/web_contents_delegate_android.h

Issue 13150004: Support color chooser inside extesions, apps, chrome frame, dev tool (Closed) Base URL: http://git.chromium.org/chromium/src.git@ngcolor
Patch Set: Removed chrome/browser/ui/color_chooser.cc Created 7 years, 8 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 #ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H _ 5 #ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H _
6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H _ 6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H _
7 7
8 #include "base/android/jni_helper.h" 8 #include "base/android/jni_helper.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 // Binds this WebContentsDelegateAndroid to the passed WebContents instance, 46 // Binds this WebContentsDelegateAndroid to the passed WebContents instance,
47 // such that when that WebContents is destroyed, this 47 // such that when that WebContents is destroyed, this
48 // WebContentsDelegateAndroid instance will be destroyed too. 48 // WebContentsDelegateAndroid instance will be destroyed too.
49 void SetOwnerWebContents(content::WebContents* contents); 49 void SetOwnerWebContents(content::WebContents* contents);
50 50
51 // Overridden from WebContentsDelegate: 51 // Overridden from WebContentsDelegate:
52 virtual content::WebContents* OpenURLFromTab( 52 virtual content::WebContents* OpenURLFromTab(
53 content::WebContents* source, 53 content::WebContents* source,
54 const content::OpenURLParams& params) OVERRIDE; 54 const content::OpenURLParams& params) OVERRIDE;
55 55
Ben Goodger (Google) 2013/04/19 16:24:54 delete nl
keishi 2013/04/22 01:54:29 Done.
56 virtual content::ColorChooser* OpenColorChooser( 56 virtual content::ColorChooser* OpenColorChooser(content::WebContents* source,
57 content::WebContents* source, int color_chooser_id, 57 SkColor color) OVERRIDE;
58 SkColor color) OVERRIDE;
59 virtual void NavigationStateChanged(const content::WebContents* source, 58 virtual void NavigationStateChanged(const content::WebContents* source,
60 unsigned changed_flags) OVERRIDE; 59 unsigned changed_flags) OVERRIDE;
61 virtual void AddNewContents(content::WebContents* source, 60 virtual void AddNewContents(content::WebContents* source,
62 content::WebContents* new_contents, 61 content::WebContents* new_contents,
63 WindowOpenDisposition disposition, 62 WindowOpenDisposition disposition,
64 const gfx::Rect& initial_pos, 63 const gfx::Rect& initial_pos,
65 bool user_gesture, 64 bool user_gesture,
66 bool* was_blocked) OVERRIDE; 65 bool* was_blocked) OVERRIDE;
67 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; 66 virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
68 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; 67 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // strong reference to that object as long as they want to receive callbacks 100 // strong reference to that object as long as they want to receive callbacks
102 // on it. Using a weak ref here allows it to be correctly GCed. 101 // on it. Using a weak ref here allows it to be correctly GCed.
103 JavaObjectWeakGlobalRef weak_java_delegate_; 102 JavaObjectWeakGlobalRef weak_java_delegate_;
104 }; 103 };
105 104
106 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); 105 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);
107 106
108 } // namespace components 107 } // namespace components
109 108
110 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI D_H_ 109 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI D_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698