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

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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 static GURL GetDevToolsUrl(Profile* profile, bool docked, 101 static GURL GetDevToolsUrl(Profile* profile, bool docked,
102 bool shared_worker_frontend); 102 bool shared_worker_frontend);
103 void UpdateTheme(); 103 void UpdateTheme();
104 void AddDevToolsExtensionsToClient(); 104 void AddDevToolsExtensionsToClient();
105 void CallClientFunction(const std::string& function_name, 105 void CallClientFunction(const std::string& function_name,
106 const base::Value* arg); 106 const base::Value* arg);
107 // Overridden from content::WebContentsDelegate. 107 // Overridden from content::WebContentsDelegate.
108 virtual content::WebContents* OpenURLFromTab( 108 virtual content::WebContents* OpenURLFromTab(
109 content::WebContents* source, 109 content::WebContents* source,
110 const content::OpenURLParams& params) OVERRIDE; 110 const content::OpenURLParams& params) OVERRIDE;
111 virtual void AddNewContents(content::WebContents* source, 111 virtual bool AddNewContents(content::WebContents* source,
112 content::WebContents* new_contents, 112 content::WebContents* new_contents,
113 WindowOpenDisposition disposition, 113 WindowOpenDisposition disposition,
114 const gfx::Rect& initial_pos, 114 const gfx::Rect& initial_pos,
115 bool user_gesture) OVERRIDE; 115 bool user_gesture) OVERRIDE;
116 virtual void CloseContents(content::WebContents* source) OVERRIDE {} 116 virtual void CloseContents(content::WebContents* source) OVERRIDE {}
117 virtual bool PreHandleKeyboardEvent( 117 virtual bool PreHandleKeyboardEvent(
118 content::WebContents* source, 118 content::WebContents* source,
119 const content::NativeWebKeyboardEvent& event, 119 const content::NativeWebKeyboardEvent& event,
120 bool* is_keyboard_shortcut) OVERRIDE; 120 bool* is_keyboard_shortcut) OVERRIDE;
121 virtual void HandleKeyboardEvent( 121 virtual void HandleKeyboardEvent(
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 bool docked_; 164 bool docked_;
165 bool is_loaded_; 165 bool is_loaded_;
166 DevToolsToggleAction action_on_load_; 166 DevToolsToggleAction action_on_load_;
167 content::NotificationRegistrar registrar_; 167 content::NotificationRegistrar registrar_;
168 content::DevToolsClientHost* frontend_host_; 168 content::DevToolsClientHost* frontend_host_;
169 scoped_ptr<DevToolsFileHelper> file_helper_; 169 scoped_ptr<DevToolsFileHelper> file_helper_;
170 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); 170 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
171 }; 171 };
172 172
173 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 173 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698