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

Side by Side Diff: content/public/browser/web_contents_delegate.cc

Issue 10831060: Refactor the Android port to allow access to the chrome layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit fixed. Created 8 years, 4 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
« no previous file with comments | « content/public/browser/web_contents_delegate.h ('k') | no next file » | 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) 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
128 128
129 bool WebContentsDelegate::ShouldCreateWebContents( 129 bool WebContentsDelegate::ShouldCreateWebContents(
130 WebContents* web_contents, 130 WebContents* web_contents,
131 int route_id, 131 int route_id,
132 WindowContainerType window_container_type, 132 WindowContainerType window_container_type,
133 const string16& frame_name, 133 const string16& frame_name,
134 const GURL& target_url) { 134 const GURL& target_url) {
135 return true; 135 return true;
136 } 136 }
137 137
138 #if defined(OS_ANDROID)
139 bool WebContentsDelegate::ShouldOverrideLoading(const GURL& url) {
140 return false;
141 }
142 #endif
143
138 JavaScriptDialogCreator* WebContentsDelegate::GetJavaScriptDialogCreator() { 144 JavaScriptDialogCreator* WebContentsDelegate::GetJavaScriptDialogCreator() {
139 return NULL; 145 return NULL;
140 } 146 }
141 147
142 bool WebContentsDelegate::IsFullscreenForTabOrPending( 148 bool WebContentsDelegate::IsFullscreenForTabOrPending(
143 const WebContents* web_contents) const { 149 const WebContents* web_contents) const {
144 return false; 150 return false;
145 } 151 }
146 152
147 content::ColorChooser* WebContentsDelegate::OpenColorChooser( 153 content::ColorChooser* WebContentsDelegate::OpenColorChooser(
(...skipping 23 matching lines...) Expand all
171 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); 177 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end());
172 attached_contents_.insert(web_contents); 178 attached_contents_.insert(web_contents);
173 } 179 }
174 180
175 void WebContentsDelegate::Detach(WebContents* web_contents) { 181 void WebContentsDelegate::Detach(WebContents* web_contents) {
176 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); 182 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end());
177 attached_contents_.erase(web_contents); 183 attached_contents_.erase(web_contents);
178 } 184 }
179 185
180 } // namespace content 186 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/web_contents_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698