| OLD | NEW |
| 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 #include "content/public/browser/web_contents_delegate.h" | 5 #include "content/public/browser/web_contents_delegate.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
| 10 #include "content/public/browser/render_view_host.h" | 10 #include "content/public/browser/render_view_host.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 WindowContainerType window_container_type, | 124 WindowContainerType window_container_type, |
| 125 const string16& frame_name, | 125 const string16& frame_name, |
| 126 const GURL& target_url) { | 126 const GURL& target_url) { |
| 127 return true; | 127 return true; |
| 128 } | 128 } |
| 129 | 129 |
| 130 JavaScriptDialogCreator* WebContentsDelegate::GetJavaScriptDialogCreator() { | 130 JavaScriptDialogCreator* WebContentsDelegate::GetJavaScriptDialogCreator() { |
| 131 return NULL; | 131 return NULL; |
| 132 } | 132 } |
| 133 | 133 |
| 134 bool WebContentsDelegate::IsFullscreenForTab(const WebContents* tab) const { | 134 bool WebContentsDelegate::IsFullscreenForTabOrPending( |
| 135 const WebContents* tab) const { |
| 135 return false; | 136 return false; |
| 136 } | 137 } |
| 137 | 138 |
| 138 content::ColorChooser* WebContentsDelegate::OpenColorChooser(WebContents* tab, | 139 content::ColorChooser* WebContentsDelegate::OpenColorChooser(WebContents* tab, |
| 139 int color_chooser_id, | 140 int color_chooser_id, |
| 140 const SkColor& color) { | 141 const SkColor& color) { |
| 141 return NULL; | 142 return NULL; |
| 142 } | 143 } |
| 143 | 144 |
| 144 void WebContentsDelegate::WebIntentDispatch( | 145 void WebContentsDelegate::WebIntentDispatch( |
| (...skipping 16 matching lines...) Expand all Loading... |
| 161 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); | 162 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); |
| 162 attached_contents_.insert(web_contents); | 163 attached_contents_.insert(web_contents); |
| 163 } | 164 } |
| 164 | 165 |
| 165 void WebContentsDelegate::Detach(WebContents* web_contents) { | 166 void WebContentsDelegate::Detach(WebContents* web_contents) { |
| 166 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); | 167 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); |
| 167 attached_contents_.erase(web_contents); | 168 attached_contents_.erase(web_contents); |
| 168 } | 169 } |
| 169 | 170 |
| 170 } // namespace content | 171 } // namespace content |
| OLD | NEW |