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 CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ | 5 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ |
6 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ | 6 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ |
7 | 7 |
8 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h" | 8 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h" |
9 #include "chrome/browser/devtools/devtools_toggle_action.h" | 9 #include "chrome/browser/devtools/devtools_toggle_action.h" |
10 #include "chrome/browser/devtools/devtools_ui_bindings.h" | 10 #include "chrome/browser/devtools/devtools_ui_bindings.h" |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 const std::string& settings); | 243 const std::string& settings); |
244 | 244 |
245 static DevToolsWindow* CreateDevToolsWindowForWorker(Profile* profile); | 245 static DevToolsWindow* CreateDevToolsWindowForWorker(Profile* profile); |
246 static void ToggleDevToolsWindow( | 246 static void ToggleDevToolsWindow( |
247 content::WebContents* web_contents, | 247 content::WebContents* web_contents, |
248 bool force_open, | 248 bool force_open, |
249 const DevToolsToggleAction& action, | 249 const DevToolsToggleAction& action, |
250 const std::string& settings); | 250 const std::string& settings); |
251 | 251 |
252 // content::WebContentsDelegate: | 252 // content::WebContentsDelegate: |
253 void ActivateContents(content::WebContents* contents) override; | 253 void ActivateContents(content::WebContents* contents, |
| 254 bool user_gesture) override; |
254 void AddNewContents(content::WebContents* source, | 255 void AddNewContents(content::WebContents* source, |
255 content::WebContents* new_contents, | 256 content::WebContents* new_contents, |
256 WindowOpenDisposition disposition, | 257 WindowOpenDisposition disposition, |
257 const gfx::Rect& initial_rect, | 258 const gfx::Rect& initial_rect, |
258 bool user_gesture, | 259 bool user_gesture, |
259 bool* was_blocked) override; | 260 bool* was_blocked) override; |
260 void WebContentsCreated(content::WebContents* source_contents, | 261 void WebContentsCreated(content::WebContents* source_contents, |
261 int opener_render_frame_id, | 262 int opener_render_frame_id, |
262 const base::string16& frame_name, | 263 const base::string16& frame_name, |
263 const GURL& target_url, | 264 const GURL& target_url, |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 base::Closure close_callback_; | 327 base::Closure close_callback_; |
327 | 328 |
328 base::TimeTicks inspect_element_start_time_; | 329 base::TimeTicks inspect_element_start_time_; |
329 scoped_ptr<DevToolsEventForwarder> event_forwarder_; | 330 scoped_ptr<DevToolsEventForwarder> event_forwarder_; |
330 | 331 |
331 friend class DevToolsEventForwarder; | 332 friend class DevToolsEventForwarder; |
332 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); | 333 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); |
333 }; | 334 }; |
334 | 335 |
335 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ | 336 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ |
OLD | NEW |