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

Side by Side Diff: content/shell/shell.h

Issue 10828356: Very basic Android browser-side compositing support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
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 CONTENT_SHELL_SHELL_H_ 5 #ifndef CONTENT_SHELL_SHELL_H_
6 #define CONTENT_SHELL_SHELL_H_ 6 #define CONTENT_SHELL_SHELL_H_
7 7
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // Registers the Android Java to native methods. 96 // Registers the Android Java to native methods.
97 static bool Register(JNIEnv* env); 97 static bool Register(JNIEnv* env);
98 #endif 98 #endif
99 99
100 // WebContentsDelegate 100 // WebContentsDelegate
101 virtual WebContents* OpenURLFromTab(WebContents* source, 101 virtual WebContents* OpenURLFromTab(WebContents* source,
102 const OpenURLParams& params) OVERRIDE; 102 const OpenURLParams& params) OVERRIDE;
103 virtual void LoadingStateChanged(WebContents* source) OVERRIDE; 103 virtual void LoadingStateChanged(WebContents* source) OVERRIDE;
104 #if defined(OS_ANDROID) 104 #if defined(OS_ANDROID)
105 virtual void LoadProgressChanged(double progress) OVERRIDE; 105 virtual void LoadProgressChanged(double progress) OVERRIDE;
106 virtual void AttachLayer(WebContents* web_contents,
107 WebKit::WebLayer* layer) OVERRIDE;
108 virtual void RemoveLayer(WebContents* web_contents,
109 WebKit::WebLayer* layer) OVERRIDE;
106 #endif 110 #endif
107 virtual void CloseContents(WebContents* source) OVERRIDE; 111 virtual void CloseContents(WebContents* source) OVERRIDE;
108 virtual void WebContentsCreated(WebContents* source_contents, 112 virtual void WebContentsCreated(WebContents* source_contents,
109 int64 source_frame_id, 113 int64 source_frame_id,
110 const GURL& target_url, 114 const GURL& target_url,
111 WebContents* new_contents) OVERRIDE; 115 WebContents* new_contents) OVERRIDE;
112 virtual void DidNavigateMainFramePostCommit( 116 virtual void DidNavigateMainFramePostCommit(
113 WebContents* web_contents) OVERRIDE; 117 WebContents* web_contents) OVERRIDE;
114 virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE; 118 virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE;
115 #if defined(OS_MACOSX) 119 #if defined(OS_MACOSX)
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 static base::Callback<void(Shell*)> shell_created_callback_; 232 static base::Callback<void(Shell*)> shell_created_callback_;
229 233
230 // True if the destructur of Shell should post a quit closure on the current 234 // True if the destructur of Shell should post a quit closure on the current
231 // message loop if the destructed Shell object was the last one. 235 // message loop if the destructed Shell object was the last one.
232 static bool quit_message_loop_; 236 static bool quit_message_loop_;
233 }; 237 };
234 238
235 } // namespace content 239 } // namespace content
236 240
237 #endif // CONTENT_SHELL_SHELL_H_ 241 #endif // CONTENT_SHELL_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698