OLD | NEW |
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/web_contents.h" | 5 #include "chrome/browser/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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 } | 171 } |
172 | 172 |
173 private: | 173 private: |
174 WebContents* contents_; | 174 WebContents* contents_; |
175 }; | 175 }; |
176 | 176 |
177 WebContents::WebContents(Profile* profile, | 177 WebContents::WebContents(Profile* profile, |
178 SiteInstance* site_instance, | 178 SiteInstance* site_instance, |
179 RenderViewHostFactory* render_view_factory, | 179 RenderViewHostFactory* render_view_factory, |
180 int routing_id, | 180 int routing_id, |
181 HANDLE modal_dialog_event) | 181 base::WaitableEvent* modal_dialog_event) |
182 : TabContents(TAB_CONTENTS_WEB), | 182 : TabContents(TAB_CONTENTS_WEB), |
183 view_(new WebContentsViewWin(this)), | 183 view_(new WebContentsViewWin(this)), |
184 ALLOW_THIS_IN_INITIALIZER_LIST( | 184 ALLOW_THIS_IN_INITIALIZER_LIST( |
185 render_manager_(render_view_factory, this, this)), | 185 render_manager_(render_view_factory, this, this)), |
186 render_view_factory_(render_view_factory), | 186 render_view_factory_(render_view_factory), |
187 received_page_title_(false), | 187 received_page_title_(false), |
188 is_starred_(false), | 188 is_starred_(false), |
189 printing_(*this), | 189 printing_(*this), |
190 notify_disconnection_(false), | 190 notify_disconnection_(false), |
191 message_box_active_(CreateEvent(NULL, TRUE, FALSE, NULL)), | 191 message_box_active_(CreateEvent(NULL, TRUE, FALSE, NULL)), |
(...skipping 1595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1787 // The favicon url isn't valid. This means there really isn't a favicon, | 1787 // The favicon url isn't valid. This means there really isn't a favicon, |
1788 // or the favicon url wasn't obtained before the load started. This assumes | 1788 // or the favicon url wasn't obtained before the load started. This assumes |
1789 // the later. | 1789 // the later. |
1790 // TODO(sky): Need a way to set the favicon that doesn't involve generating | 1790 // TODO(sky): Need a way to set the favicon that doesn't involve generating |
1791 // its url. | 1791 // its url. |
1792 new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer)); | 1792 new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer)); |
1793 } | 1793 } |
1794 new_url->set_safe_for_autoreplace(true); | 1794 new_url->set_safe_for_autoreplace(true); |
1795 url_model->Add(new_url); | 1795 url_model->Add(new_url); |
1796 } | 1796 } |
OLD | NEW |