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

Side by Side Diff: chrome/browser/ui/views/external_tab_container_win.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_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // is not an ExternalTabContainerWin. 104 // is not an ExternalTabContainerWin.
105 static ExternalTabContainer* GetExternalContainerFromNativeWindow( 105 static ExternalTabContainer* GetExternalContainerFromNativeWindow(
106 gfx::NativeView native_window); 106 gfx::NativeView native_window);
107 107
108 // Overridden from content::WebContentsDelegate: 108 // Overridden from content::WebContentsDelegate:
109 virtual content::WebContents* OpenURLFromTab( 109 virtual content::WebContents* OpenURLFromTab(
110 content::WebContents* source, 110 content::WebContents* source,
111 const content::OpenURLParams& params) OVERRIDE; 111 const content::OpenURLParams& params) OVERRIDE;
112 virtual void NavigationStateChanged(const content::WebContents* source, 112 virtual void NavigationStateChanged(const content::WebContents* source,
113 unsigned changed_flags) OVERRIDE; 113 unsigned changed_flags) OVERRIDE;
114 virtual void AddNewContents(content::WebContents* source, 114 virtual bool AddNewContents(content::WebContents* source,
115 content::WebContents* new_contents, 115 content::WebContents* new_contents,
116 WindowOpenDisposition disposition, 116 WindowOpenDisposition disposition,
117 const gfx::Rect& initial_pos, 117 const gfx::Rect& initial_pos,
118 bool user_gesture) OVERRIDE; 118 bool user_gesture) OVERRIDE;
119 virtual void CloseContents(content::WebContents* source) OVERRIDE; 119 virtual void CloseContents(content::WebContents* source) OVERRIDE;
120 virtual void MoveContents(content::WebContents* source, 120 virtual void MoveContents(content::WebContents* source,
121 const gfx::Rect& pos) OVERRIDE; 121 const gfx::Rect& pos) OVERRIDE;
122 virtual bool IsPopupOrPanel( 122 virtual bool IsPopupOrPanel(
123 const content::WebContents* source) const OVERRIDE; 123 const content::WebContents* source) const OVERRIDE;
124 virtual void UpdateTargetURL(content::WebContents* source, int32 page_id, 124 virtual void UpdateTargetURL(content::WebContents* source, int32 page_id,
125 const GURL& url) OVERRIDE; 125 const GURL& url) OVERRIDE;
126 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; 126 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
127 virtual gfx::NativeWindow GetFrameNativeWindow() OVERRIDE; 127 virtual gfx::NativeWindow GetFrameNativeWindow() OVERRIDE;
128 virtual void WebContentsCreated(content::WebContents* source_contents, 128 virtual bool WebContentsCreated(content::WebContents* source_contents,
129 int64 source_frame_id, 129 int64 source_frame_id,
130 const GURL& target_url, 130 const GURL& target_url,
131 content::WebContents* new_contents) OVERRIDE; 131 content::WebContents* new_contents) OVERRIDE;
132 virtual bool PreHandleKeyboardEvent( 132 virtual bool PreHandleKeyboardEvent(
133 content::WebContents* source, 133 content::WebContents* source,
134 const content::NativeWebKeyboardEvent& event, 134 const content::NativeWebKeyboardEvent& event,
135 bool* is_keyboard_shortcut) OVERRIDE; 135 bool* is_keyboard_shortcut) OVERRIDE;
136 virtual void HandleKeyboardEvent( 136 virtual void HandleKeyboardEvent(
137 content::WebContents* source, 137 content::WebContents* source,
138 const content::NativeWebKeyboardEvent& event) OVERRIDE; 138 const content::NativeWebKeyboardEvent& event) OVERRIDE;
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 return false; 401 return false;
402 } 402 }
403 403
404 virtual void BeforeUnloadFired(content::WebContents* tab, bool proceed, 404 virtual void BeforeUnloadFired(content::WebContents* tab, bool proceed,
405 bool* proceed_to_fire_unload) { 405 bool* proceed_to_fire_unload) {
406 NOTREACHED(); 406 NOTREACHED();
407 } 407 }
408 }; 408 };
409 409
410 #endif // CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_ 410 #endif // CHROME_BROWSER_UI_VIEWS_EXTERNAL_TAB_CONTAINER_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698