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

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

Issue 71243002: Support headless content_shell for linux/aura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the crash seen with earlier patch in popup tests! Created 7 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
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 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 #elif defined(OS_ANDROID) 261 #elif defined(OS_ANDROID)
262 base::android::ScopedJavaGlobalRef<jobject> java_object_; 262 base::android::ScopedJavaGlobalRef<jobject> java_object_;
263 #elif defined(USE_AURA) 263 #elif defined(USE_AURA)
264 #if defined(OS_CHROMEOS) 264 #if defined(OS_CHROMEOS)
265 static wm::WMTestHelper* wm_test_helper_; 265 static wm::WMTestHelper* wm_test_helper_;
266 #endif 266 #endif
267 #if defined(TOOLKIT_VIEWS) 267 #if defined(TOOLKIT_VIEWS)
268 static views::ViewsDelegate* views_delegate_; 268 static views::ViewsDelegate* views_delegate_;
269 269
270 views::Widget* window_widget_; 270 views::Widget* window_widget_;
271 int content_width_;
272 int content_height_;
271 #else // defined(TOOLKIT_VIEWS) 273 #else // defined(TOOLKIT_VIEWS)
272 static ShellAuraPlatformData* platform_; 274 static ShellAuraPlatformData* platform_;
273 #endif // defined(TOOLKIT_VIEWS) 275 #endif // defined(TOOLKIT_VIEWS)
274 #endif 276 #endif
275 277
276 bool headless_; 278 bool headless_;
277 279
278 // A container of all the open windows. We use a vector so we can keep track 280 // A container of all the open windows. We use a vector so we can keep track
279 // of ordering. 281 // of ordering.
280 static std::vector<Shell*> windows_; 282 static std::vector<Shell*> windows_;
281 283
282 static base::Callback<void(Shell*)> shell_created_callback_; 284 static base::Callback<void(Shell*)> shell_created_callback_;
283 285
284 // True if the destructur of Shell should post a quit closure on the current 286 // True if the destructur of Shell should post a quit closure on the current
285 // message loop if the destructed Shell object was the last one. 287 // message loop if the destructed Shell object was the last one.
286 static bool quit_message_loop_; 288 static bool quit_message_loop_;
287 }; 289 };
288 290
289 } // namespace content 291 } // namespace content
290 292
291 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 293 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698