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

Side by Side Diff: chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h

Issue 10978016: Remove two functions on WebContentsDelegate which didn't belong in content. They were only called f… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: nits and fixed prerender browser tests Created 8 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) 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_INTENTS_WEB_INTENT_INLINE_DISPOSITION_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_INTENTS_WEB_INTENT_INLINE_DISPOSITION_DELEGATE_H_
6 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_INLINE_DISPOSITION_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_INLINE_DISPOSITION_DELEGATE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "chrome/browser/extensions/extension_function_dispatcher.h" 9 #include "chrome/browser/extensions/extension_function_dispatcher.h"
10 #include "content/public/browser/web_contents_delegate.h" 10 #include "content/public/browser/web_contents_delegate.h"
(...skipping 15 matching lines...) Expand all
26 // |contents| is the WebContents for the inline disposition. 26 // |contents| is the WebContents for the inline disposition.
27 // |browser| is the browser inline disposition was invoked from. 27 // |browser| is the browser inline disposition was invoked from.
28 WebIntentInlineDispositionDelegate(WebIntentPicker* picker, 28 WebIntentInlineDispositionDelegate(WebIntentPicker* picker,
29 content::WebContents* contents, 29 content::WebContents* contents,
30 Browser* browser); 30 Browser* browser);
31 virtual ~WebIntentInlineDispositionDelegate(); 31 virtual ~WebIntentInlineDispositionDelegate();
32 32
33 // WebContentsDelegate implementation. 33 // WebContentsDelegate implementation.
34 virtual bool IsPopupOrPanel( 34 virtual bool IsPopupOrPanel(
35 const content::WebContents* source) const OVERRIDE; 35 const content::WebContents* source) const OVERRIDE;
36 virtual bool ShouldAddNavigationToHistory(
37 const history::HistoryAddPageArgs& add_page_args,
38 content::NavigationType navigation_type) OVERRIDE;
39 virtual content::WebContents* OpenURLFromTab( 36 virtual content::WebContents* OpenURLFromTab(
40 content::WebContents* source, 37 content::WebContents* source,
41 const content::OpenURLParams& params) OVERRIDE; 38 const content::OpenURLParams& params) OVERRIDE;
42 virtual void AddNewContents(content::WebContents* source, 39 virtual void AddNewContents(content::WebContents* source,
43 content::WebContents* new_contents, 40 content::WebContents* new_contents,
44 WindowOpenDisposition disposition, 41 WindowOpenDisposition disposition,
45 const gfx::Rect& initial_pos, 42 const gfx::Rect& initial_pos,
46 bool user_gesture, 43 bool user_gesture,
47 bool* was_blocked) OVERRIDE; 44 bool* was_blocked) OVERRIDE;
48 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; 45 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
(...skipping 19 matching lines...) Expand all
68 // The WebContents container. Weak pointer. 65 // The WebContents container. Weak pointer.
69 content::WebContents* web_contents_; 66 content::WebContents* web_contents_;
70 67
71 Browser* browser_; // Weak pointer. 68 Browser* browser_; // Weak pointer.
72 69
73 // Dispatch handler for extension APIs. 70 // Dispatch handler for extension APIs.
74 ExtensionFunctionDispatcher extension_function_dispatcher_; 71 ExtensionFunctionDispatcher extension_function_dispatcher_;
75 }; 72 };
76 73
77 #endif // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_INLINE_DISPOSITION_DELEGATE_H_ 74 #endif // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_INLINE_DISPOSITION_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698