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

Side by Side Diff: chrome/browser/tab_contents/web_contents.cc

Issue 62044: Make the RenderViewHostFactory a global. This prevents us from having to pass... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "chrome/browser/tab_contents/web_contents.h" 5 #include "chrome/browser/tab_contents/web_contents.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 184
185 private: 185 private:
186 WebContents* contents_; 186 WebContents* contents_;
187 }; 187 };
188 188
189 // static 189 // static
190 int WebContents::find_request_id_counter_ = -1; 190 int WebContents::find_request_id_counter_ = -1;
191 191
192 WebContents::WebContents(Profile* profile, 192 WebContents::WebContents(Profile* profile,
193 SiteInstance* site_instance, 193 SiteInstance* site_instance,
194 RenderViewHostFactory* render_view_factory,
195 int routing_id, 194 int routing_id,
196 base::WaitableEvent* modal_dialog_event) 195 base::WaitableEvent* modal_dialog_event)
197 : TabContents(TAB_CONTENTS_WEB), 196 : TabContents(TAB_CONTENTS_WEB),
198 view_(WebContentsView::Create(this)), 197 view_(WebContentsView::Create(this)),
199 ALLOW_THIS_IN_INITIALIZER_LIST( 198 ALLOW_THIS_IN_INITIALIZER_LIST(render_manager_(this, this)),
200 render_manager_(render_view_factory, this, this)),
201 render_view_factory_(render_view_factory),
202 printing_(*this), 199 printing_(*this),
203 notify_disconnection_(false), 200 notify_disconnection_(false),
204 received_page_title_(false), 201 received_page_title_(false),
205 is_starred_(false), 202 is_starred_(false),
206 #if defined(OS_WIN) 203 #if defined(OS_WIN)
207 message_box_active_(CreateEvent(NULL, TRUE, FALSE, NULL)), 204 message_box_active_(CreateEvent(NULL, TRUE, FALSE, NULL)),
208 #endif 205 #endif
209 ALLOW_THIS_IN_INITIALIZER_LIST(fav_icon_helper_(this)), 206 ALLOW_THIS_IN_INITIALIZER_LIST(fav_icon_helper_(this)),
210 suppress_javascript_messages_(false), 207 suppress_javascript_messages_(false),
211 load_state_(net::LOAD_STATE_IDLE), 208 load_state_(net::LOAD_STATE_IDLE),
(...skipping 1819 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 // -> Use pending DOM UI if any. 2028 // -> Use pending DOM UI if any.
2032 // 2029 //
2033 // - Normal state with no load: committed nav entry + no pending nav entry: 2030 // - Normal state with no load: committed nav entry + no pending nav entry:
2034 // -> Use committed DOM UI. 2031 // -> Use committed DOM UI.
2035 if (controller()->GetPendingEntry() && 2032 if (controller()->GetPendingEntry() &&
2036 (controller()->GetLastCommittedEntry() || 2033 (controller()->GetLastCommittedEntry() ||
2037 render_manager_.pending_dom_ui())) 2034 render_manager_.pending_dom_ui()))
2038 return render_manager_.pending_dom_ui(); 2035 return render_manager_.pending_dom_ui();
2039 return render_manager_.dom_ui(); 2036 return render_manager_.dom_ui();
2040 } 2037 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/web_contents.h ('k') | chrome/browser/tab_contents/web_contents_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698