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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10387110: Remove VIEW_TYPE_WEB_CONTENTS and make default view type INVALID. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: blah Created 8 years, 7 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/browser/web_contents/web_contents_impl.h ('k') | content/public/common/view_type.h » ('j') | 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/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 #endif 280 #endif
281 is_showing_before_unload_dialog_(false), 281 is_showing_before_unload_dialog_(false),
282 opener_web_ui_type_(WebUI::kNoWebUI), 282 opener_web_ui_type_(WebUI::kNoWebUI),
283 closed_by_user_gesture_(false), 283 closed_by_user_gesture_(false),
284 minimum_zoom_percent_( 284 minimum_zoom_percent_(
285 static_cast<int>(content::kMinimumZoomFactor * 100)), 285 static_cast<int>(content::kMinimumZoomFactor * 100)),
286 maximum_zoom_percent_( 286 maximum_zoom_percent_(
287 static_cast<int>(content::kMaximumZoomFactor * 100)), 287 static_cast<int>(content::kMaximumZoomFactor * 100)),
288 temporary_zoom_settings_(false), 288 temporary_zoom_settings_(false),
289 content_restrictions_(0), 289 content_restrictions_(0),
290 view_type_(content::VIEW_TYPE_WEB_CONTENTS), 290 view_type_(content::VIEW_TYPE_INVALID),
291 color_chooser_(NULL) { 291 color_chooser_(NULL) {
292 render_manager_.Init(browser_context, site_instance, routing_id); 292 render_manager_.Init(browser_context, site_instance, routing_id);
293 293
294 view_.reset(content::GetContentClient()->browser()-> 294 view_.reset(content::GetContentClient()->browser()->
295 OverrideCreateWebContentsView(this)); 295 OverrideCreateWebContentsView(this));
296 if (!view_.get()) { 296 if (!view_.get()) {
297 content::WebContentsViewDelegate* delegate = 297 content::WebContentsViewDelegate* delegate =
298 content::GetContentClient()->browser()->GetWebContentsViewDelegate( 298 content::GetContentClient()->browser()->GetWebContentsViewDelegate(
299 this); 299 this);
300 #if defined(USE_AURA) 300 #if defined(USE_AURA)
(...skipping 2437 matching lines...) Expand 10 before | Expand all | Expand 10 after
2738 void WebContentsImpl::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { 2738 void WebContentsImpl::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
2739 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh); 2739 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
2740 // Can be NULL during tests. 2740 // Can be NULL during tests.
2741 if (rwh_view) 2741 if (rwh_view)
2742 rwh_view->SetSize(GetView()->GetContainerSize()); 2742 rwh_view->SetSize(GetView()->GetContainerSize());
2743 } 2743 }
2744 2744
2745 RenderViewHostImpl* WebContentsImpl::GetRenderViewHostImpl() { 2745 RenderViewHostImpl* WebContentsImpl::GetRenderViewHostImpl() {
2746 return static_cast<RenderViewHostImpl*>(GetRenderViewHost()); 2746 return static_cast<RenderViewHostImpl*>(GetRenderViewHost());
2747 } 2747 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/public/common/view_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698