| OLD | NEW |
| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 #if defined(OS_MACOSX) | 100 #if defined(OS_MACOSX) |
| 101 // Public to be called by an ObjC bridge object. | 101 // Public to be called by an ObjC bridge object. |
| 102 void ActionPerformed(int control); | 102 void ActionPerformed(int control); |
| 103 void URLEntered(const std::string& url_string); | 103 void URLEntered(const std::string& url_string); |
| 104 #elif defined(OS_ANDROID) | 104 #elif defined(OS_ANDROID) |
| 105 // Registers the Android Java to native methods. | 105 // Registers the Android Java to native methods. |
| 106 static bool Register(JNIEnv* env); | 106 static bool Register(JNIEnv* env); |
| 107 #endif | 107 #endif |
| 108 | 108 |
| 109 // WebContentsDelegate | 109 // WebContentsDelegate |
| 110 WebContents* OpenURLFromTab(WebContents* source, | |
| 111 const OpenURLParams& params) override; | |
| 112 void AddNewContents(WebContents* source, | 110 void AddNewContents(WebContents* source, |
| 113 WebContents* new_contents, | 111 WebContents* new_contents, |
| 114 WindowOpenDisposition disposition, | 112 WindowOpenDisposition disposition, |
| 115 const gfx::Rect& initial_rect, | 113 const gfx::Rect& initial_rect, |
| 116 bool user_gesture, | 114 bool user_gesture, |
| 117 bool* was_blocked) override; | 115 bool* was_blocked) override; |
| 118 void LoadingStateChanged(WebContents* source, | 116 void LoadingStateChanged(WebContents* source, |
| 119 bool to_different_document) override; | 117 bool to_different_document) override; |
| 120 #if defined(OS_ANDROID) | 118 #if defined(OS_ANDROID) |
| 121 void LoadProgressChanged(WebContents* source, double progress) override; | 119 void LoadProgressChanged(WebContents* source, double progress) override; |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 static base::Callback<void(Shell*)> shell_created_callback_; | 253 static base::Callback<void(Shell*)> shell_created_callback_; |
| 256 | 254 |
| 257 // True if the destructur of Shell should post a quit closure on the current | 255 // True if the destructur of Shell should post a quit closure on the current |
| 258 // message loop if the destructed Shell object was the last one. | 256 // message loop if the destructed Shell object was the last one. |
| 259 static bool quit_message_loop_; | 257 static bool quit_message_loop_; |
| 260 }; | 258 }; |
| 261 | 259 |
| 262 } // namespace content | 260 } // namespace content |
| 263 | 261 |
| 264 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ | 262 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ |
| OLD | NEW |