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

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

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 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 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 #endif 205 #endif
206 206
207 gfx::NativeView GetContentView(); 207 gfx::NativeView GetContentView();
208 208
209 // WebContentsObserver 209 // WebContentsObserver
210 virtual void TitleWasSet(NavigationEntry* entry, bool explicit_set) OVERRIDE; 210 virtual void TitleWasSet(NavigationEntry* entry, bool explicit_set) OVERRIDE;
211 211
212 void InnerShowDevTools(const std::string& settings); 212 void InnerShowDevTools(const std::string& settings);
213 void OnDevToolsWebContentsDestroyed(); 213 void OnDevToolsWebContentsDestroyed();
214 214
215 #if defined(TOOLKIT_GTK)
216 CHROMEGTK_CALLBACK_0(Shell, void, OnBackButtonClicked);
217 CHROMEGTK_CALLBACK_0(Shell, void, OnForwardButtonClicked);
218 CHROMEGTK_CALLBACK_0(Shell, void, OnReloadButtonClicked);
219 CHROMEGTK_CALLBACK_0(Shell, void, OnStopButtonClicked);
220 CHROMEGTK_CALLBACK_0(Shell, void, OnURLEntryActivate);
221 CHROMEGTK_CALLBACK_0(Shell, gboolean, OnWindowDestroyed);
222
223 CHROMEG_CALLBACK_3(Shell, gboolean, OnCloseWindowKeyPressed, GtkAccelGroup*,
224 GObject*, guint, GdkModifierType);
225 CHROMEG_CALLBACK_3(Shell, gboolean, OnNewWindowKeyPressed, GtkAccelGroup*,
226 GObject*, guint, GdkModifierType);
227 CHROMEG_CALLBACK_3(Shell, gboolean, OnHighlightURLView, GtkAccelGroup*,
228 GObject*, guint, GdkModifierType);
229 CHROMEG_CALLBACK_3(Shell, gboolean, OnReloadKeyPressed, GtkAccelGroup*,
230 GObject*, guint, GdkModifierType);
231 #endif
232
233 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_; 215 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_;
234 216
235 scoped_ptr<WebContents> web_contents_; 217 scoped_ptr<WebContents> web_contents_;
236 218
237 scoped_ptr<DevToolsWebContentsObserver> devtools_observer_; 219 scoped_ptr<DevToolsWebContentsObserver> devtools_observer_;
238 ShellDevToolsFrontend* devtools_frontend_; 220 ShellDevToolsFrontend* devtools_frontend_;
239 221
240 bool is_fullscreen_; 222 bool is_fullscreen_;
241 223
242 gfx::NativeWindow window_; 224 gfx::NativeWindow window_;
243 gfx::NativeEditView url_edit_view_; 225 gfx::NativeEditView url_edit_view_;
244 226
245 gfx::Size content_size_; 227 gfx::Size content_size_;
246 228
247 #if defined(TOOLKIT_GTK) 229 #if defined(OS_ANDROID)
248 GtkWidget* vbox_;
249
250 GtkToolItem* back_button_;
251 GtkToolItem* forward_button_;
252 GtkToolItem* reload_button_;
253 GtkToolItem* stop_button_;
254
255 GtkWidget* spinner_;
256 GtkToolItem* spinner_item_;
257
258 int ui_elements_height_; // height of menubar, toolbar, etc.
259 #elif defined(OS_ANDROID)
260 base::android::ScopedJavaGlobalRef<jobject> java_object_; 230 base::android::ScopedJavaGlobalRef<jobject> java_object_;
261 #elif defined(USE_AURA) 231 #elif defined(USE_AURA)
262 #if defined(OS_CHROMEOS) 232 #if defined(OS_CHROMEOS)
263 static wm::WMTestHelper* wm_test_helper_; 233 static wm::WMTestHelper* wm_test_helper_;
264 #endif 234 #endif
265 #if defined(TOOLKIT_VIEWS) 235 #if defined(TOOLKIT_VIEWS)
266 static views::ViewsDelegate* views_delegate_; 236 static views::ViewsDelegate* views_delegate_;
267 237
268 views::Widget* window_widget_; 238 views::Widget* window_widget_;
269 #endif // defined(TOOLKIT_VIEWS) 239 #endif // defined(TOOLKIT_VIEWS)
270 static ShellPlatformDataAura* platform_; 240 static ShellPlatformDataAura* platform_;
271 #endif // defined(USE_AURA) 241 #endif // defined(USE_AURA)
272 242
273 bool headless_; 243 bool headless_;
274 244
275 // A container of all the open windows. We use a vector so we can keep track 245 // A container of all the open windows. We use a vector so we can keep track
276 // of ordering. 246 // of ordering.
277 static std::vector<Shell*> windows_; 247 static std::vector<Shell*> windows_;
278 248
279 static base::Callback<void(Shell*)> shell_created_callback_; 249 static base::Callback<void(Shell*)> shell_created_callback_;
280 250
281 // True if the destructur of Shell should post a quit closure on the current 251 // True if the destructur of Shell should post a quit closure on the current
282 // message loop if the destructed Shell object was the last one. 252 // message loop if the destructed Shell object was the last one.
283 static bool quit_message_loop_; 253 static bool quit_message_loop_;
284 }; 254 };
285 255
286 } // namespace content 256 } // namespace content
287 257
288 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 258 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/renderer/webscrollbarbehavior_impl_gtkoraura.cc ('k') | content/shell/browser/shell_javascript_dialog_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698