| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 JavaScriptDialogManager* WebContentsDelegate::GetJavaScriptDialogManager() { | 128 JavaScriptDialogManager* WebContentsDelegate::GetJavaScriptDialogManager() { |
| 129 return NULL; | 129 return NULL; |
| 130 } | 130 } |
| 131 | 131 |
| 132 bool WebContentsDelegate::IsFullscreenForTabOrPending( | 132 bool WebContentsDelegate::IsFullscreenForTabOrPending( |
| 133 const WebContents* web_contents) const { | 133 const WebContents* web_contents) const { |
| 134 return false; | 134 return false; |
| 135 } | 135 } |
| 136 | 136 |
| 137 content::ColorChooser* WebContentsDelegate::OpenColorChooser( | 137 content::ColorChooser* WebContentsDelegate::OpenColorChooser( |
| 138 WebContents* web_contents, | 138 WebContents* web_contents, SkColor color) { |
| 139 int color_chooser_id, | |
| 140 SkColor color) { | |
| 141 return NULL; | 139 return NULL; |
| 142 } | 140 } |
| 143 | 141 |
| 144 bool WebContentsDelegate::RequestPpapiBrokerPermission( | 142 bool WebContentsDelegate::RequestPpapiBrokerPermission( |
| 145 WebContents* web_contents, | 143 WebContents* web_contents, |
| 146 const GURL& url, | 144 const GURL& url, |
| 147 const base::FilePath& plugin_path, | 145 const base::FilePath& plugin_path, |
| 148 const base::Callback<void(bool)>& callback) { | 146 const base::Callback<void(bool)>& callback) { |
| 149 return false; | 147 return false; |
| 150 } | 148 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 161 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); | 159 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); |
| 162 attached_contents_.insert(web_contents); | 160 attached_contents_.insert(web_contents); |
| 163 } | 161 } |
| 164 | 162 |
| 165 void WebContentsDelegate::Detach(WebContents* web_contents) { | 163 void WebContentsDelegate::Detach(WebContents* web_contents) { |
| 166 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); | 164 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); |
| 167 attached_contents_.erase(web_contents); | 165 attached_contents_.erase(web_contents); |
| 168 } | 166 } |
| 169 | 167 |
| 170 } // namespace content | 168 } // namespace content |
| OLD | NEW |