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

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

Issue 10802064: Make content_shell and content_browsertests working with aura (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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 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
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/string_piece.h" 13 #include "base/string_piece.h"
14 #include "content/public/browser/notification_registrar.h" 14 #include "content/public/browser/notification_registrar.h"
15 #include "content/public/browser/notification_observer.h" 15 #include "content/public/browser/notification_observer.h"
16 #include "content/public/browser/web_contents_delegate.h" 16 #include "content/public/browser/web_contents_delegate.h"
17 #include "ipc/ipc_channel.h" 17 #include "ipc/ipc_channel.h"
18 #include "ui/gfx/native_widget_types.h" 18 #include "ui/gfx/native_widget_types.h"
19 19
20 #if defined(TOOLKIT_GTK) 20 #if defined(TOOLKIT_GTK)
21 #include <gtk/gtk.h> 21 #include <gtk/gtk.h>
22 #include "ui/base/gtk/gtk_signal.h" 22 #include "ui/base/gtk/gtk_signal.h"
23 23
24 typedef struct _GtkToolItem GtkToolItem; 24 typedef struct _GtkToolItem GtkToolItem;
25 #elif defined(OS_ANDROID) 25 #elif defined(OS_ANDROID)
26 #include "base/android/scoped_java_ref.h" 26 #include "base/android/scoped_java_ref.h"
27 #elif defined(USE_AURA)
28 namespace views {
29 class Widget;
30 class ViewsDelegate;
31 }
32 namespace aura {
33 namespace client {
34 class StackingClient;
jam 2012/07/23 14:39:46 nit: no indentation here and above
35 }
36 }
27 #endif 37 #endif
28 38
29 class GURL; 39 class GURL;
30 class WebContents; 40 class WebContents;
31 41
32 namespace content { 42 namespace content {
33 43
34 class BrowserContext; 44 class BrowserContext;
35 class ShellJavaScriptDialogCreator; 45 class ShellJavaScriptDialogCreator;
36 class SiteInstance; 46 class SiteInstance;
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 GtkToolItem* reload_button_; 198 GtkToolItem* reload_button_;
189 GtkToolItem* stop_button_; 199 GtkToolItem* stop_button_;
190 200
191 GtkWidget* spinner_; 201 GtkWidget* spinner_;
192 GtkToolItem* spinner_item_; 202 GtkToolItem* spinner_item_;
193 203
194 int content_width_; 204 int content_width_;
195 int content_height_; 205 int content_height_;
196 #elif defined(OS_ANDROID) 206 #elif defined(OS_ANDROID)
197 base::android::ScopedJavaGlobalRef<jobject> java_object_; 207 base::android::ScopedJavaGlobalRef<jobject> java_object_;
208 #elif defined(USE_AURA)
209 static scoped_ptr<aura::client::StackingClient> stacking_client_;
210 static scoped_ptr<views::ViewsDelegate> views_delegate_;
211
212 views::Widget* window_widget_;
198 #endif 213 #endif
199 214
200 // A container of all the open windows. We use a vector so we can keep track 215 // A container of all the open windows. We use a vector so we can keep track
201 // of ordering. 216 // of ordering.
202 static std::vector<Shell*> windows_; 217 static std::vector<Shell*> windows_;
203 218
204 // True if the destructur of Shell should post a quit closure on the current 219 // True if the destructur of Shell should post a quit closure on the current
205 // message loop if the destructed Shell object was the last one. 220 // message loop if the destructed Shell object was the last one.
206 static bool quit_message_loop_; 221 static bool quit_message_loop_;
207 }; 222 };
208 223
209 } // namespace content 224 } // namespace content
210 225
211 #endif // CONTENT_SHELL_SHELL_H_ 226 #endif // CONTENT_SHELL_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698