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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 // Used for content_browsertests. Called once. | 93 // Used for content_browsertests. Called once. |
94 static void SetShellCreatedCallback( | 94 static void SetShellCreatedCallback( |
95 base::Callback<void(Shell*)> shell_created_callback); | 95 base::Callback<void(Shell*)> shell_created_callback); |
96 | 96 |
97 WebContents* web_contents() const { return web_contents_.get(); } | 97 WebContents* web_contents() const { return web_contents_.get(); } |
98 gfx::NativeWindow window() { return window_; } | 98 gfx::NativeWindow window() { return window_; } |
99 | 99 |
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(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, | 110 WebContents* OpenURLFromTab(WebContents* source, |
111 const OpenURLParams& params) override; | 111 const OpenURLParams& params) override; |
112 void AddNewContents(WebContents* source, | 112 void AddNewContents(WebContents* source, |
113 WebContents* new_contents, | 113 WebContents* new_contents, |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 static base::Callback<void(Shell*)> shell_created_callback_; | 254 static base::Callback<void(Shell*)> shell_created_callback_; |
255 | 255 |
256 // True if the destructur of Shell should post a quit closure on the current | 256 // True if the destructur of Shell should post a quit closure on the current |
257 // message loop if the destructed Shell object was the last one. | 257 // message loop if the destructed Shell object was the last one. |
258 static bool quit_message_loop_; | 258 static bool quit_message_loop_; |
259 }; | 259 }; |
260 | 260 |
261 } // namespace content | 261 } // namespace content |
262 | 262 |
263 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ | 263 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ |
OLD | NEW |