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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 virtual void CloseContents(WebContents* source) OVERRIDE; | 109 virtual void CloseContents(WebContents* source) OVERRIDE; |
110 virtual void WebContentsCreated(WebContents* source_contents, | 110 virtual void WebContentsCreated(WebContents* source_contents, |
111 int64 source_frame_id, | 111 int64 source_frame_id, |
112 const GURL& target_url, | 112 const GURL& target_url, |
113 WebContents* new_contents) OVERRIDE; | 113 WebContents* new_contents) OVERRIDE; |
114 virtual void DidNavigateMainFramePostCommit( | 114 virtual void DidNavigateMainFramePostCommit( |
115 WebContents* web_contents) OVERRIDE; | 115 WebContents* web_contents) OVERRIDE; |
116 virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE; | 116 virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE; |
117 #if defined(OS_MACOSX) | 117 #if defined(OS_MACOSX) |
118 virtual void HandleKeyboardEvent( | 118 virtual void HandleKeyboardEvent( |
| 119 WebContents* source, |
119 const NativeWebKeyboardEvent& event) OVERRIDE; | 120 const NativeWebKeyboardEvent& event) OVERRIDE; |
120 #endif | 121 #endif |
121 virtual bool AddMessageToConsole(WebContents* source, | 122 virtual bool AddMessageToConsole(WebContents* source, |
122 int32 level, | 123 int32 level, |
123 const string16& message, | 124 const string16& message, |
124 int32 line_no, | 125 int32 line_no, |
125 const string16& source_id) OVERRIDE; | 126 const string16& source_id) OVERRIDE; |
126 | 127 |
127 private: | 128 private: |
128 enum UIControl { | 129 enum UIControl { |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 static base::Callback<void(Shell*)> shell_created_callback_; | 228 static base::Callback<void(Shell*)> shell_created_callback_; |
228 | 229 |
229 // True if the destructur of Shell should post a quit closure on the current | 230 // True if the destructur of Shell should post a quit closure on the current |
230 // message loop if the destructed Shell object was the last one. | 231 // message loop if the destructed Shell object was the last one. |
231 static bool quit_message_loop_; | 232 static bool quit_message_loop_; |
232 }; | 233 }; |
233 | 234 |
234 } // namespace content | 235 } // namespace content |
235 | 236 |
236 #endif // CONTENT_SHELL_SHELL_H_ | 237 #endif // CONTENT_SHELL_SHELL_H_ |
OLD | NEW |