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

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

Issue 18263: Move search engines files into subdir (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 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 | « chrome/browser/rlz/rlz.cc ('k') | chrome/browser/template_url.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) 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 12 matching lines...) Expand all
23 #include "chrome/browser/jsmessage_box_handler.h" 23 #include "chrome/browser/jsmessage_box_handler.h"
24 #include "chrome/browser/load_from_memory_cache_details.h" 24 #include "chrome/browser/load_from_memory_cache_details.h"
25 #include "chrome/browser/load_notification_details.h" 25 #include "chrome/browser/load_notification_details.h"
26 #include "chrome/browser/modal_html_dialog_delegate.h" 26 #include "chrome/browser/modal_html_dialog_delegate.h"
27 #include "chrome/browser/password_manager/password_manager.h" 27 #include "chrome/browser/password_manager/password_manager.h"
28 #include "chrome/browser/plugin_installer.h" 28 #include "chrome/browser/plugin_installer.h"
29 #include "chrome/browser/plugin_service.h" 29 #include "chrome/browser/plugin_service.h"
30 #include "chrome/browser/printing/print_job.h" 30 #include "chrome/browser/printing/print_job.h"
31 #include "chrome/browser/render_view_host.h" 31 #include "chrome/browser/render_view_host.h"
32 #include "chrome/browser/render_widget_host_view_win.h" // TODO(brettw) delete me. 32 #include "chrome/browser/render_widget_host_view_win.h" // TODO(brettw) delete me.
33 #include "chrome/browser/search_engines/template_url_fetcher.h"
34 #include "chrome/browser/search_engines/template_url_model.h"
33 #include "chrome/browser/tab_contents/navigation_entry.h" 35 #include "chrome/browser/tab_contents/navigation_entry.h"
34 #include "chrome/browser/tab_contents/web_contents_view.h" 36 #include "chrome/browser/tab_contents/web_contents_view.h"
35 #include "chrome/browser/tab_contents/web_contents_view_win.h" 37 #include "chrome/browser/tab_contents/web_contents_view_win.h"
36 #include "chrome/browser/template_url_fetcher.h"
37 #include "chrome/browser/template_url_model.h"
38 #include "chrome/browser/views/hung_renderer_view.h" // TODO(brettw) delete me. 38 #include "chrome/browser/views/hung_renderer_view.h" // TODO(brettw) delete me.
39 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
40 #include "chrome/common/l10n_util.h" 40 #include "chrome/common/l10n_util.h"
41 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
42 #include "chrome/common/pref_service.h" 42 #include "chrome/common/pref_service.h"
43 #include "chrome/common/resource_bundle.h" 43 #include "chrome/common/resource_bundle.h"
44 #include "net/base/mime_util.h" 44 #include "net/base/mime_util.h"
45 #include "net/base/registry_controlled_domain.h" 45 #include "net/base/registry_controlled_domain.h"
46 #include "webkit/glue/webkit_glue.h" 46 #include "webkit/glue/webkit_glue.h"
47 47
(...skipping 1739 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/rlz/rlz.cc ('k') | chrome/browser/template_url.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698