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

Side by Side Diff: content/browser/tab_contents/tab_contents.cc

Issue 7717011: Get rid of static TabContentsView::Create function since the interface is in content, but the imp... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Fix mac build Created 9 years, 3 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/site_instance_unittest.cc ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/tab_contents/tab_contents.h" 5 #include "content/browser/tab_contents/tab_contents.h"
6 6
7 #include <cmath> 7 #include <cmath>
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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 TabContents::TabContents(content::BrowserContext* browser_context, 164 TabContents::TabContents(content::BrowserContext* browser_context,
165 SiteInstance* site_instance, 165 SiteInstance* site_instance,
166 int routing_id, 166 int routing_id,
167 const TabContents* base_tab_contents, 167 const TabContents* base_tab_contents,
168 SessionStorageNamespace* session_storage_namespace) 168 SessionStorageNamespace* session_storage_namespace)
169 : delegate_(NULL), 169 : delegate_(NULL),
170 ALLOW_THIS_IN_INITIALIZER_LIST(controller_( 170 ALLOW_THIS_IN_INITIALIZER_LIST(controller_(
171 this, browser_context, session_storage_namespace)), 171 this, browser_context, session_storage_namespace)),
172 ALLOW_THIS_IN_INITIALIZER_LIST(view_( 172 ALLOW_THIS_IN_INITIALIZER_LIST(view_(
173 TabContentsView::Create(this))), 173 content::GetContentClient()->browser()->CreateTabContentsView(this))),
174 ALLOW_THIS_IN_INITIALIZER_LIST(render_manager_(this, this)), 174 ALLOW_THIS_IN_INITIALIZER_LIST(render_manager_(this, this)),
175 is_loading_(false), 175 is_loading_(false),
176 crashed_status_(base::TERMINATION_STATUS_STILL_RUNNING), 176 crashed_status_(base::TERMINATION_STATUS_STILL_RUNNING),
177 crashed_error_code_(0), 177 crashed_error_code_(0),
178 waiting_for_response_(false), 178 waiting_for_response_(false),
179 max_page_id_(-1), 179 max_page_id_(-1),
180 load_state_(net::LOAD_STATE_IDLE, string16()), 180 load_state_(net::LOAD_STATE_IDLE, string16()),
181 upload_size_(0), 181 upload_size_(0),
182 upload_position_(0), 182 upload_position_(0),
183 displayed_insecure_content_(false), 183 displayed_insecure_content_(false),
(...skipping 1753 matching lines...) Expand 10 before | Expand all | Expand 10 after
1937 } 1937 }
1938 1938
1939 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) { 1939 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) {
1940 render_manager_.SwapInRenderViewHost(rvh); 1940 render_manager_.SwapInRenderViewHost(rvh);
1941 } 1941 }
1942 1942
1943 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { 1943 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
1944 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh); 1944 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
1945 rwh_view->SetSize(view()->GetContainerSize()); 1945 rwh_view->SetSize(view()->GetContainerSize());
1946 } 1946 }
OLDNEW
« no previous file with comments | « content/browser/site_instance_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698