OLD | NEW |
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 |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 #elif defined(TOOLKIT_GTK) | 175 #elif defined(TOOLKIT_GTK) |
176 CHROMEGTK_CALLBACK_0(Shell, void, OnBackButtonClicked); | 176 CHROMEGTK_CALLBACK_0(Shell, void, OnBackButtonClicked); |
177 CHROMEGTK_CALLBACK_0(Shell, void, OnForwardButtonClicked); | 177 CHROMEGTK_CALLBACK_0(Shell, void, OnForwardButtonClicked); |
178 CHROMEGTK_CALLBACK_0(Shell, void, OnReloadButtonClicked); | 178 CHROMEGTK_CALLBACK_0(Shell, void, OnReloadButtonClicked); |
179 CHROMEGTK_CALLBACK_0(Shell, void, OnStopButtonClicked); | 179 CHROMEGTK_CALLBACK_0(Shell, void, OnStopButtonClicked); |
180 CHROMEGTK_CALLBACK_0(Shell, void, OnURLEntryActivate); | 180 CHROMEGTK_CALLBACK_0(Shell, void, OnURLEntryActivate); |
181 CHROMEGTK_CALLBACK_0(Shell, gboolean, OnWindowDestroyed); | 181 CHROMEGTK_CALLBACK_0(Shell, gboolean, OnWindowDestroyed); |
182 | 182 |
183 CHROMEG_CALLBACK_3(Shell, gboolean, OnCloseWindowKeyPressed, GtkAccelGroup*, | 183 CHROMEG_CALLBACK_3(Shell, gboolean, OnCloseWindowKeyPressed, GtkAccelGroup*, |
184 GObject*, guint, GdkModifierType); | 184 GObject*, guint, GdkModifierType); |
| 185 CHROMEG_CALLBACK_3(Shell, gboolean, OnNewWindowKeyPressed, GtkAccelGroup*, |
| 186 GObject*, guint, GdkModifierType); |
185 CHROMEG_CALLBACK_3(Shell, gboolean, OnHighlightURLView, GtkAccelGroup*, | 187 CHROMEG_CALLBACK_3(Shell, gboolean, OnHighlightURLView, GtkAccelGroup*, |
186 GObject*, guint, GdkModifierType); | 188 GObject*, guint, GdkModifierType); |
187 #endif | 189 #endif |
188 | 190 |
189 scoped_ptr<ShellJavaScriptDialogCreator> dialog_creator_; | 191 scoped_ptr<ShellJavaScriptDialogCreator> dialog_creator_; |
190 | 192 |
191 scoped_ptr<WebContents> web_contents_; | 193 scoped_ptr<WebContents> web_contents_; |
192 | 194 |
193 gfx::NativeWindow window_; | 195 gfx::NativeWindow window_; |
194 gfx::NativeEditView url_edit_view_; | 196 gfx::NativeEditView url_edit_view_; |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 static base::Callback<void(Shell*)> shell_created_callback_; | 230 static base::Callback<void(Shell*)> shell_created_callback_; |
229 | 231 |
230 // True if the destructur of Shell should post a quit closure on the current | 232 // True if the destructur of Shell should post a quit closure on the current |
231 // message loop if the destructed Shell object was the last one. | 233 // message loop if the destructed Shell object was the last one. |
232 static bool quit_message_loop_; | 234 static bool quit_message_loop_; |
233 }; | 235 }; |
234 | 236 |
235 } // namespace content | 237 } // namespace content |
236 | 238 |
237 #endif // CONTENT_SHELL_SHELL_H_ | 239 #endif // CONTENT_SHELL_SHELL_H_ |
OLD | NEW |