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

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

Issue 2431753002: Mus experiment in content shell on Android.
Patch Set: Fix mac bot Created 4 years, 1 month 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
« no previous file with comments | « content/shell/browser/DEPS ('k') | content/shell/browser/shell_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_ 4 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_
5 #define CONTENT_SHELL_BROWSER_SHELL_H_ 5 #define CONTENT_SHELL_BROWSER_SHELL_H_
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/callback_forward.h" 12 #include "base/callback_forward.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/strings/string_piece.h" 14 #include "base/strings/string_piece.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "content/public/browser/web_contents_delegate.h" 16 #include "content/public/browser/web_contents_delegate.h"
17 #include "content/public/browser/web_contents_observer.h" 17 #include "content/public/browser/web_contents_observer.h"
18 #include "ipc/ipc_channel.h" 18 #include "ipc/ipc_channel.h"
19 #include "ui/gfx/geometry/size.h" 19 #include "ui/gfx/geometry/size.h"
20 #include "ui/gfx/native_widget_types.h" 20 #include "ui/gfx/native_widget_types.h"
21 21
22 #if defined(OS_ANDROID) 22 #if defined(OS_ANDROID)
23 #include "base/android/scoped_java_ref.h" 23 #include "base/android/scoped_java_ref.h"
24 #include "services/service_manager/public/cpp/connection.h"
24 #elif defined(USE_AURA) 25 #elif defined(USE_AURA)
25 #if defined(OS_CHROMEOS) 26 #if defined(OS_CHROMEOS)
26 27
27 namespace display { 28 namespace display {
28 class Screen; 29 class Screen;
29 } 30 }
30 31
31 namespace wm { 32 namespace wm {
32 class WMTestHelper; 33 class WMTestHelper;
33 } 34 }
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 WebContents* web_contents() const { return web_contents_.get(); } 112 WebContents* web_contents() const { return web_contents_.get(); }
112 gfx::NativeWindow window() { return window_; } 113 gfx::NativeWindow window() { return window_; }
113 114
114 #if defined(OS_MACOSX) 115 #if defined(OS_MACOSX)
115 // Public to be called by an ObjC bridge object. 116 // Public to be called by an ObjC bridge object.
116 void ActionPerformed(int control); 117 void ActionPerformed(int control);
117 void URLEntered(const std::string& url_string); 118 void URLEntered(const std::string& url_string);
118 #elif defined(OS_ANDROID) 119 #elif defined(OS_ANDROID)
119 // Registers the Android Java to native methods. 120 // Registers the Android Java to native methods.
120 static bool Register(JNIEnv* env); 121 static bool Register(JNIEnv* env);
122 void StartMusDemo(JNIEnv* env,
123 const base::android::JavaParamRef<jobject>& caller);
121 #endif 124 #endif
122 125
123 // WebContentsDelegate 126 // WebContentsDelegate
124 WebContents* OpenURLFromTab(WebContents* source, 127 WebContents* OpenURLFromTab(WebContents* source,
125 const OpenURLParams& params) override; 128 const OpenURLParams& params) override;
126 void AddNewContents(WebContents* source, 129 void AddNewContents(WebContents* source,
127 WebContents* new_contents, 130 WebContents* new_contents,
128 WindowOpenDisposition disposition, 131 WindowOpenDisposition disposition,
129 const gfx::Rect& initial_rect, 132 const gfx::Rect& initial_rect,
130 bool user_gesture, 133 bool user_gesture,
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 248
246 gfx::NativeWindow window_; 249 gfx::NativeWindow window_;
247 #if defined(OS_MACOSX) 250 #if defined(OS_MACOSX)
248 NSTextField* url_edit_view_; 251 NSTextField* url_edit_view_;
249 #endif 252 #endif
250 253
251 gfx::Size content_size_; 254 gfx::Size content_size_;
252 255
253 #if defined(OS_ANDROID) 256 #if defined(OS_ANDROID)
254 base::android::ScopedJavaGlobalRef<jobject> java_object_; 257 base::android::ScopedJavaGlobalRef<jobject> java_object_;
258 std::unique_ptr<service_manager::Connection> mus_demo_connection_;
255 #elif defined(USE_AURA) 259 #elif defined(USE_AURA)
256 #if defined(OS_CHROMEOS) 260 #if defined(OS_CHROMEOS)
257 static wm::WMTestHelper* wm_test_helper_; 261 static wm::WMTestHelper* wm_test_helper_;
258 static display::Screen* test_screen_; 262 static display::Screen* test_screen_;
259 #else 263 #else
260 static wm::WMState* wm_state_; 264 static wm::WMState* wm_state_;
261 #endif 265 #endif
262 #if defined(TOOLKIT_VIEWS) 266 #if defined(TOOLKIT_VIEWS)
263 static views::ViewsDelegate* views_delegate_; 267 static views::ViewsDelegate* views_delegate_;
264 268
(...skipping 11 matching lines...) Expand all
276 static base::Callback<void(Shell*)> shell_created_callback_; 280 static base::Callback<void(Shell*)> shell_created_callback_;
277 281
278 // True if the destructur of Shell should post a quit closure on the current 282 // True if the destructur of Shell should post a quit closure on the current
279 // message loop if the destructed Shell object was the last one. 283 // message loop if the destructed Shell object was the last one.
280 static bool quit_message_loop_; 284 static bool quit_message_loop_;
281 }; 285 };
282 286
283 } // namespace content 287 } // namespace content
284 288
285 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 289 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/shell/browser/DEPS ('k') | content/shell/browser/shell_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698