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

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

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 void AddDevToolsExtensionsToClient(); 91 void AddDevToolsExtensionsToClient();
92 void CallClientFunction(const string16& function_name, 92 void CallClientFunction(const string16& function_name,
93 const base::Value& arg); 93 const base::Value& arg);
94 // Overridden from TabContentsDelegate. 94 // Overridden from TabContentsDelegate.
95 // Deprecated. Use two-arguments variant instead. 95 // Deprecated. Use two-arguments variant instead.
96 virtual TabContents* OpenURLFromTab( 96 virtual TabContents* OpenURLFromTab(
97 TabContents* source, 97 TabContents* source,
98 const GURL& url, 98 const GURL& url,
99 const GURL& referrer, 99 const GURL& referrer,
100 WindowOpenDisposition disposition, 100 WindowOpenDisposition disposition,
101 PageTransition::Type transition) OVERRIDE; 101 content::PageTransition transition) OVERRIDE;
102 virtual TabContents* OpenURLFromTab(TabContents* source, 102 virtual TabContents* OpenURLFromTab(TabContents* source,
103 const OpenURLParams& params) OVERRIDE; 103 const OpenURLParams& params) OVERRIDE;
104 virtual void AddNewContents(TabContents* source, 104 virtual void AddNewContents(TabContents* source,
105 TabContents* new_contents, 105 TabContents* new_contents,
106 WindowOpenDisposition disposition, 106 WindowOpenDisposition disposition,
107 const gfx::Rect& initial_pos, 107 const gfx::Rect& initial_pos,
108 bool user_gesture); 108 bool user_gesture);
109 virtual void CloseContents(TabContents* source) {} 109 virtual void CloseContents(TabContents* source) {}
110 virtual bool CanReloadContents(TabContents* source) const; 110 virtual bool CanReloadContents(TabContents* source) const;
111 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 111 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
(...skipping 25 matching lines...) Expand all
137 TabContentsWrapper* tab_contents_; 137 TabContentsWrapper* tab_contents_;
138 Browser* browser_; 138 Browser* browser_;
139 bool docked_; 139 bool docked_;
140 bool is_loaded_; 140 bool is_loaded_;
141 DevToolsToggleAction action_on_load_; 141 DevToolsToggleAction action_on_load_;
142 NotificationRegistrar registrar_; 142 NotificationRegistrar registrar_;
143 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); 143 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
144 }; 144 };
145 145
146 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 146 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698