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

Side by Side Diff: chrome/browser/external_tab_container_win.h

Issue 8551002: browser: Add missing OVERRIDE annotation to ExternalTabContainer implementing TabContentsDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ShowPageInfo does not override any base class methods Created 9 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/external_tab_container_win.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) 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_EXTERNAL_TAB_CONTAINER_WIN_H_ 5 #ifndef CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
6 #define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_ 6 #define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // TODO(adriansc): Remove method once refactoring changed all call sites. 121 // TODO(adriansc): Remove method once refactoring changed all call sites.
122 virtual TabContents* OpenURLFromTab( 122 virtual TabContents* OpenURLFromTab(
123 TabContents* source, 123 TabContents* source,
124 const GURL& url, 124 const GURL& url,
125 const GURL& referrer, 125 const GURL& referrer,
126 WindowOpenDisposition disposition, 126 WindowOpenDisposition disposition,
127 content::PageTransition transition) OVERRIDE; 127 content::PageTransition transition) OVERRIDE;
128 virtual TabContents* OpenURLFromTab(TabContents* source, 128 virtual TabContents* OpenURLFromTab(TabContents* source,
129 const OpenURLParams& params) OVERRIDE; 129 const OpenURLParams& params) OVERRIDE;
130 virtual void NavigationStateChanged(const TabContents* source, 130 virtual void NavigationStateChanged(const TabContents* source,
131 unsigned changed_flags); 131 unsigned changed_flags) OVERRIDE;
132 virtual void AddNewContents(TabContents* source, 132 virtual void AddNewContents(TabContents* source,
133 TabContents* new_contents, 133 TabContents* new_contents,
134 WindowOpenDisposition disposition, 134 WindowOpenDisposition disposition,
135 const gfx::Rect& initial_pos, 135 const gfx::Rect& initial_pos,
136 bool user_gesture); 136 bool user_gesture) OVERRIDE;
137 virtual void CloseContents(TabContents* source); 137 virtual void CloseContents(TabContents* source) OVERRIDE;
138 virtual void MoveContents(TabContents* source, const gfx::Rect& pos); 138 virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE;
139 virtual bool IsPopup(const TabContents* source) const; 139 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE;
140 virtual void UpdateTargetURL(TabContents* source, int32 page_id, 140 virtual void UpdateTargetURL(TabContents* source, int32 page_id,
141 const GURL& url); 141 const GURL& url) OVERRIDE;
142 virtual void ContentsZoomChange(bool zoom_in); 142 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
143 virtual gfx::NativeWindow GetFrameNativeWindow(); 143 virtual gfx::NativeWindow GetFrameNativeWindow() OVERRIDE;
144 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 144 virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
145 bool* is_keyboard_shortcut); 145 bool* is_keyboard_shortcut) OVERRIDE;
146 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); 146 virtual void HandleKeyboardEvent(
147 virtual bool TakeFocus(bool reverse); 147 const NativeWebKeyboardEvent& event) OVERRIDE;
148 virtual bool CanDownload(TabContents* source, int request_id); 148 virtual bool TakeFocus(bool reverse) OVERRIDE;
149 virtual bool OnGoToEntryOffset(int offset); 149 virtual bool CanDownload(TabContents* source, int request_id) OVERRIDE;
150 virtual void ShowPageInfo(Profile* profile, 150 virtual bool OnGoToEntryOffset(int offset) OVERRIDE;
151 const GURL& url, 151 virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
152 const NavigationEntry::SSLStatus& ssl, 152 virtual bool ExecuteContextMenuCommand(int command) OVERRIDE;
153 bool show_history);
154 virtual bool HandleContextMenu(const ContextMenuParams& params);
155 virtual bool ExecuteContextMenuCommand(int command);
156 virtual void BeforeUnloadFired(TabContents* tab, 153 virtual void BeforeUnloadFired(TabContents* tab,
157 bool proceed, 154 bool proceed,
158 bool* proceed_to_fire_unload); 155 bool* proceed_to_fire_unload) OVERRIDE;
159 virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator(); 156 virtual content::JavaScriptDialogCreator*
160 virtual void ShowRepostFormWarningDialog(TabContents* tab_contents); 157 GetJavaScriptDialogCreator() OVERRIDE;
161 virtual void RunFileChooser(TabContents* tab, 158 virtual void ShowRepostFormWarningDialog(TabContents* tab_contents) OVERRIDE;
162 const ViewHostMsg_RunFileChooser_Params& params); 159 virtual void RunFileChooser(
163 virtual void EnumerateDirectory(TabContents* tab, int request_id, 160 TabContents* tab,
164 const FilePath& path); 161 const ViewHostMsg_RunFileChooser_Params& params) OVERRIDE;
162 virtual void EnumerateDirectory(TabContents* tab,
163 int request_id,
164 const FilePath& path) OVERRIDE;
165 virtual void JSOutOfMemory(TabContents* tab); 165 virtual void JSOutOfMemory(TabContents* tab);
166 virtual void RegisterProtocolHandler(TabContents* tab, 166 virtual void RegisterProtocolHandler(TabContents* tab,
167 const std::string& protocol, 167 const std::string& protocol,
168 const GURL& url, 168 const GURL& url,
169 const string16& title); 169 const string16& title) OVERRIDE;
170 virtual void RegisterIntentHandler(TabContents* tab, 170 virtual void RegisterIntentHandler(TabContents* tab,
171 const string16& action, 171 const string16& action,
172 const string16& type, 172 const string16& type,
173 const string16& href, 173 const string16& href,
174 const string16& title, 174 const string16& title,
175 const string16& disposition) OVERRIDE; 175 const string16& disposition) OVERRIDE;
176 virtual void WebIntentDispatch(TabContents* tab, 176 virtual void WebIntentDispatch(TabContents* tab,
177 int routing_id, 177 int routing_id,
178 const webkit_glue::WebIntentData& intent, 178 const webkit_glue::WebIntentData& intent,
179 int intent_id) OVERRIDE; 179 int intent_id) OVERRIDE;
180 virtual void FindReply(TabContents* tab, 180 virtual void FindReply(TabContents* tab,
181 int request_id, 181 int request_id,
182 int number_of_matches, 182 int number_of_matches,
183 const gfx::Rect& selection_rect, 183 const gfx::Rect& selection_rect,
184 int active_match_ordinal, 184 int active_match_ordinal,
185 bool final_update); 185 bool final_update) OVERRIDE;
186 virtual void CrashedPlugin(TabContents* tab, 186 virtual void CrashedPlugin(TabContents* tab,
187 const FilePath& plugin_path); 187 const FilePath& plugin_path) OVERRIDE;
188
189 virtual void ShowPageInfo(Profile* profile,
190 const GURL& url,
191 const NavigationEntry::SSLStatus& ssl,
192 bool show_history);
Lei Zhang 2011/11/14 20:51:32 Doesn't this need an OVERRIDE, since it's overridi
188 193
189 void RegisterRenderViewHost(RenderViewHost* render_view_host); 194 void RegisterRenderViewHost(RenderViewHost* render_view_host);
190 void UnregisterRenderViewHost(RenderViewHost* render_view_host); 195 void UnregisterRenderViewHost(RenderViewHost* render_view_host);
191 196
192 // Overridden from TabContentsObserver: 197 // Overridden from TabContentsObserver:
193 // IPC::Channel::Listener implementation. 198 // IPC::Channel::Listener implementation.
194 virtual bool OnMessageReceived(const IPC::Message& message); 199 virtual bool OnMessageReceived(const IPC::Message& message);
195 200
196 // Message handlers 201 // Message handlers
197 void OnForwardMessageToExternalHost(const std::string& message, 202 void OnForwardMessageToExternalHost(const std::string& message,
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 return false; 418 return false;
414 } 419 }
415 420
416 virtual void BeforeUnloadFired(TabContents* tab, bool proceed, 421 virtual void BeforeUnloadFired(TabContents* tab, bool proceed,
417 bool* proceed_to_fire_unload) { 422 bool* proceed_to_fire_unload) {
418 NOTREACHED(); 423 NOTREACHED();
419 } 424 }
420 }; 425 };
421 426
422 #endif // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_ 427 #endif // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/external_tab_container_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698