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

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

Issue 12431011: Avoid retaining the pointer to inspected WebContents in DevToolsWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 const std::vector<DevToolsFileHelper::FileSystem>& file_systems); 191 const std::vector<DevToolsFileHelper::FileSystem>& file_systems);
192 void FileSystemAdded(std::string error_string, 192 void FileSystemAdded(std::string error_string,
193 const DevToolsFileHelper::FileSystem& file_system); 193 const DevToolsFileHelper::FileSystem& file_system);
194 194
195 void UpdateBrowserToolbar(); 195 void UpdateBrowserToolbar();
196 bool IsDocked(); 196 bool IsDocked();
197 static DevToolsDockSide GetDockSideFromPrefs(Profile* profile); 197 static DevToolsDockSide GetDockSideFromPrefs(Profile* profile);
198 static std::string SideToString(DevToolsDockSide dock_side); 198 static std::string SideToString(DevToolsDockSide dock_side);
199 static DevToolsDockSide SideFromString(const std::string& dock_side); 199 static DevToolsDockSide SideFromString(const std::string& dock_side);
200 200
201 content::WebContents* GetInspectedWebContents();
202
203 class InspectedWebContentsObserver;
204 scoped_ptr<InspectedWebContentsObserver> inspected_contents_observer_;
205
201 Profile* profile_; 206 Profile* profile_;
202 content::WebContents* inspected_web_contents_;
203 content::WebContents* web_contents_; 207 content::WebContents* web_contents_;
204 Browser* browser_; 208 Browser* browser_;
205 DevToolsDockSide dock_side_; 209 DevToolsDockSide dock_side_;
206 bool is_loaded_; 210 bool is_loaded_;
207 DevToolsToggleAction action_on_load_; 211 DevToolsToggleAction action_on_load_;
208 content::NotificationRegistrar registrar_; 212 content::NotificationRegistrar registrar_;
209 scoped_ptr<content::DevToolsClientHost> frontend_host_; 213 scoped_ptr<content::DevToolsClientHost> frontend_host_;
210 base::WeakPtrFactory<DevToolsWindow> weak_factory_; 214 base::WeakPtrFactory<DevToolsWindow> weak_factory_;
211 scoped_ptr<DevToolsFileHelper> file_helper_; 215 scoped_ptr<DevToolsFileHelper> file_helper_;
212 int width_; 216 int width_;
213 int height_; 217 int height_;
214 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); 218 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
215 }; 219 };
216 220
217 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ 221 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698