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

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: fix other comment 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
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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 #endif 279 #endif
280 is_showing_before_unload_dialog_(false), 280 is_showing_before_unload_dialog_(false),
281 opener_web_ui_type_(WebUI::kNoWebUI), 281 opener_web_ui_type_(WebUI::kNoWebUI),
282 closed_by_user_gesture_(false), 282 closed_by_user_gesture_(false),
283 minimum_zoom_percent_( 283 minimum_zoom_percent_(
284 static_cast<int>(content::kMinimumZoomFactor * 100)), 284 static_cast<int>(content::kMinimumZoomFactor * 100)),
285 maximum_zoom_percent_( 285 maximum_zoom_percent_(
286 static_cast<int>(content::kMaximumZoomFactor * 100)), 286 static_cast<int>(content::kMaximumZoomFactor * 100)),
287 temporary_zoom_settings_(false), 287 temporary_zoom_settings_(false),
288 content_restrictions_(0), 288 content_restrictions_(0),
289 view_type_(content::VIEW_TYPE_WEB_CONTENTS), 289 view_type_(content::VIEW_TYPE_INVALID),
290 color_chooser_(NULL) { 290 color_chooser_(NULL) {
291 render_manager_.Init(browser_context, site_instance, routing_id); 291 render_manager_.Init(browser_context, site_instance, routing_id);
292 292
293 view_.reset(content::GetContentClient()->browser()-> 293 view_.reset(content::GetContentClient()->browser()->
294 OverrideCreateWebContentsView(this)); 294 OverrideCreateWebContentsView(this));
295 if (!view_.get()) { 295 if (!view_.get()) {
296 content::WebContentsViewDelegate* delegate = 296 content::WebContentsViewDelegate* delegate =
297 content::GetContentClient()->browser()->GetWebContentsViewDelegate( 297 content::GetContentClient()->browser()->GetWebContentsViewDelegate(
298 this); 298 this);
299 #if defined(USE_AURA) 299 #if defined(USE_AURA)
(...skipping 2429 matching lines...) Expand 10 before | Expand all | Expand 10 after
2729 void WebContentsImpl::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { 2729 void WebContentsImpl::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
2730 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh); 2730 RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
2731 // Can be NULL during tests. 2731 // Can be NULL during tests.
2732 if (rwh_view) 2732 if (rwh_view)
2733 rwh_view->SetSize(GetView()->GetContainerSize()); 2733 rwh_view->SetSize(GetView()->GetContainerSize());
2734 } 2734 }
2735 2735
2736 RenderViewHostImpl* WebContentsImpl::GetRenderViewHostImpl() { 2736 RenderViewHostImpl* WebContentsImpl::GetRenderViewHostImpl() {
2737 return static_cast<RenderViewHostImpl*>(GetRenderViewHost()); 2737 return static_cast<RenderViewHostImpl*>(GetRenderViewHost());
2738 } 2738 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698