Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: chrome/browser/debugger/devtools_window.h

Issue 10868116: Pass result of blockage across content API when new tab blocked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_DEBUGGER_DEVTOOLS_WINDOW_H_ 5 #ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
6 #define CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 6 #define CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 void CallClientFunction(const std::string& function_name, 111 void CallClientFunction(const std::string& function_name,
112 const base::Value* arg); 112 const base::Value* arg);
113 // Overridden from content::WebContentsDelegate. 113 // Overridden from content::WebContentsDelegate.
114 virtual content::WebContents* OpenURLFromTab( 114 virtual content::WebContents* OpenURLFromTab(
115 content::WebContents* source, 115 content::WebContents* source,
116 const content::OpenURLParams& params) OVERRIDE; 116 const content::OpenURLParams& params) OVERRIDE;
117 virtual void AddNewContents(content::WebContents* source, 117 virtual void AddNewContents(content::WebContents* source,
118 content::WebContents* new_contents, 118 content::WebContents* new_contents,
119 WindowOpenDisposition disposition, 119 WindowOpenDisposition disposition,
120 const gfx::Rect& initial_pos, 120 const gfx::Rect& initial_pos,
121 bool user_gesture) OVERRIDE; 121 bool user_gesture,
122 bool* was_blocked) OVERRIDE;
122 virtual void CloseContents(content::WebContents* source) OVERRIDE {} 123 virtual void CloseContents(content::WebContents* source) OVERRIDE {}
123 virtual bool PreHandleKeyboardEvent( 124 virtual bool PreHandleKeyboardEvent(
124 content::WebContents* source, 125 content::WebContents* source,
125 const content::NativeWebKeyboardEvent& event, 126 const content::NativeWebKeyboardEvent& event,
126 bool* is_keyboard_shortcut) OVERRIDE; 127 bool* is_keyboard_shortcut) OVERRIDE;
127 virtual void HandleKeyboardEvent( 128 virtual void HandleKeyboardEvent(
128 content::WebContents* source, 129 content::WebContents* source,
129 const content::NativeWebKeyboardEvent& event) OVERRIDE; 130 const content::NativeWebKeyboardEvent& event) OVERRIDE;
130 virtual content::JavaScriptDialogCreator* 131 virtual content::JavaScriptDialogCreator*
131 GetJavaScriptDialogCreator() OVERRIDE; 132 GetJavaScriptDialogCreator() OVERRIDE;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 bool docked_; 168 bool docked_;
168 bool is_loaded_; 169 bool is_loaded_;
169 DevToolsToggleAction action_on_load_; 170 DevToolsToggleAction action_on_load_;
170 content::NotificationRegistrar registrar_; 171 content::NotificationRegistrar registrar_;
171 content::DevToolsClientHost* frontend_host_; 172 content::DevToolsClientHost* frontend_host_;
172 scoped_ptr<DevToolsFileHelper> file_helper_; 173 scoped_ptr<DevToolsFileHelper> file_helper_;
173 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); 174 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
174 }; 175 };
175 176
176 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 177 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698