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

Side by Side Diff: chromecast/browser/android/cast_window_android.h

Issue 1153813003: Add user_gesture param to WebContentsDelegate::ActivateContents Base URL: https://chromium.googlesource.com/chromium/src.git@ug1_WebContentsImpl_Activate
Patch Set: Update callers Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROMECAST_BROWSER_ANDROID_CAST_WINDOW_ANDROID_H_ 5 #ifndef CHROMECAST_BROWSER_ANDROID_CAST_WINDOW_ANDROID_H_
6 #define CHROMECAST_BROWSER_ANDROID_CAST_WINDOW_ANDROID_H_ 6 #define CHROMECAST_BROWSER_ANDROID_CAST_WINDOW_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 const gfx::Rect& initial_rect, 63 const gfx::Rect& initial_rect,
64 bool user_gesture, 64 bool user_gesture,
65 bool* was_blocked) override; 65 bool* was_blocked) override;
66 void CloseContents(content::WebContents* source) override; 66 void CloseContents(content::WebContents* source) override;
67 bool CanOverscrollContent() const override; 67 bool CanOverscrollContent() const override;
68 bool AddMessageToConsole(content::WebContents* source, 68 bool AddMessageToConsole(content::WebContents* source,
69 int32 level, 69 int32 level,
70 const base::string16& message, 70 const base::string16& message,
71 int32 line_no, 71 int32 line_no,
72 const base::string16& source_id) override; 72 const base::string16& source_id) override;
73 void ActivateContents(content::WebContents* contents) override; 73 void ActivateContents(content::WebContents* contents,
74 bool user_gesture) override;
74 void DeactivateContents(content::WebContents* contents) override; 75 void DeactivateContents(content::WebContents* contents) override;
75 76
76 // content::WebContentsObserver implementation: 77 // content::WebContentsObserver implementation:
77 void RenderProcessGone(base::TerminationStatus status) override; 78 void RenderProcessGone(base::TerminationStatus status) override;
78 79
79 private: 80 private:
80 explicit CastWindowAndroid(content::BrowserContext* browser_context); 81 explicit CastWindowAndroid(content::BrowserContext* browser_context);
81 void Initialize(); 82 void Initialize();
82 83
83 content::BrowserContext* browser_context_; 84 content::BrowserContext* browser_context_;
84 base::android::ScopedJavaGlobalRef<jobject> window_java_; 85 base::android::ScopedJavaGlobalRef<jobject> window_java_;
85 scoped_ptr<content::WebContents> web_contents_; 86 scoped_ptr<content::WebContents> web_contents_;
86 scoped_ptr<CastContentWindow> content_window_; 87 scoped_ptr<CastContentWindow> content_window_;
87 88
88 base::WeakPtrFactory<CastWindowAndroid> weak_factory_; 89 base::WeakPtrFactory<CastWindowAndroid> weak_factory_;
89 90
90 DISALLOW_COPY_AND_ASSIGN(CastWindowAndroid); 91 DISALLOW_COPY_AND_ASSIGN(CastWindowAndroid);
91 }; 92 };
92 93
93 } // namespace shell 94 } // namespace shell
94 } // namespace chromecast 95 } // namespace chromecast
95 96
96 #endif // CHROMECAST_BROWSER_ANDROID_CAST_WINDOW_ANDROID_H_ 97 #endif // CHROMECAST_BROWSER_ANDROID_CAST_WINDOW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698