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

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

Issue 10035034: Implement the skeleton of an android content shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed drawable png as it was checked in separately. Created 8 years, 8 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 #pragma once 8 #pragma once
9 9
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/string_piece.h" 14 #include "base/string_piece.h"
15 #include "content/public/browser/web_contents_delegate.h" 15 #include "content/public/browser/web_contents_delegate.h"
16 #include "content/public/browser/web_contents_observer.h" 16 #include "content/public/browser/web_contents_observer.h"
17 #include "ui/gfx/native_widget_types.h" 17 #include "ui/gfx/native_widget_types.h"
18 18
19 #if defined(TOOLKIT_GTK) 19 #if defined(TOOLKIT_GTK)
20 #include <gtk/gtk.h> 20 #include <gtk/gtk.h>
21 #include "ui/base/gtk/gtk_signal.h" 21 #include "ui/base/gtk/gtk_signal.h"
22 22
23 typedef struct _GtkToolItem GtkToolItem; 23 typedef struct _GtkToolItem GtkToolItem;
24 #elif defined(OS_ANDROID)
25 #include "content/shell/android/shell_view.h"
24 #endif 26 #endif
25 27
26 class GURL; 28 class GURL;
27 class WebContents; 29 class WebContents;
28 30
29 namespace content { 31 namespace content {
30 32
31 class BrowserContext; 33 class BrowserContext;
32 class ShellJavaScriptDialogCreator; 34 class ShellJavaScriptDialogCreator;
33 class SiteInstance; 35 class SiteInstance;
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 GtkToolItem* back_button_; 172 GtkToolItem* back_button_;
171 GtkToolItem* forward_button_; 173 GtkToolItem* forward_button_;
172 GtkToolItem* reload_button_; 174 GtkToolItem* reload_button_;
173 GtkToolItem* stop_button_; 175 GtkToolItem* stop_button_;
174 176
175 GtkWidget* spinner_; 177 GtkWidget* spinner_;
176 GtkToolItem* spinner_item_; 178 GtkToolItem* spinner_item_;
177 179
178 int content_width_; 180 int content_width_;
179 int content_height_; 181 int content_height_;
182 #elif defined(OS_ANDROID)
183 scoped_ptr<ShellView> shell_view_;
180 #endif 184 #endif
181 185
182 // A container of all the open windows. We use a vector so we can keep track 186 // A container of all the open windows. We use a vector so we can keep track
183 // of ordering. 187 // of ordering.
184 static std::vector<Shell*> windows_; 188 static std::vector<Shell*> windows_;
185 189
186 // True if the destructur of Shell should post a quit closure on the current 190 // True if the destructur of Shell should post a quit closure on the current
187 // message loop if the destructed Shell object was the last one. 191 // message loop if the destructed Shell object was the last one.
188 static bool quit_message_loop_; 192 static bool quit_message_loop_;
189 }; 193 };
190 194
191 } // namespace content 195 } // namespace content
192 196
193 #endif // CONTENT_SHELL_SHELL_H_ 197 #endif // CONTENT_SHELL_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698