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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 10662041: mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: deps Created 8 years, 5 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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #include "content/public/browser/child_process_security_policy.h" 88 #include "content/public/browser/child_process_security_policy.h"
89 #include "content/public/browser/render_process_host.h" 89 #include "content/public/browser/render_process_host.h"
90 #include "content/public/browser/render_view_host.h" 90 #include "content/public/browser/render_view_host.h"
91 #include "content/public/browser/resource_context.h" 91 #include "content/public/browser/resource_context.h"
92 #include "content/public/browser/site_instance.h" 92 #include "content/public/browser/site_instance.h"
93 #include "content/public/browser/web_contents.h" 93 #include "content/public/browser/web_contents.h"
94 #include "content/public/browser/web_contents_view.h" 94 #include "content/public/browser/web_contents_view.h"
95 #include "content/public/common/child_process_host.h" 95 #include "content/public/common/child_process_host.h"
96 #include "content/public/common/content_descriptors.h" 96 #include "content/public/common/content_descriptors.h"
97 #include "grit/generated_resources.h" 97 #include "grit/generated_resources.h"
98 #include "grit/ui_resources.h" 98 #include "grit/ui_resources_standard.h"
99 #include "net/base/ssl_cert_request_info.h" 99 #include "net/base/ssl_cert_request_info.h"
100 #include "net/cookies/cookie_monster.h" 100 #include "net/cookies/cookie_monster.h"
101 #include "net/cookies/cookie_options.h" 101 #include "net/cookies/cookie_options.h"
102 #include "ui/base/l10n/l10n_util.h" 102 #include "ui/base/l10n/l10n_util.h"
103 #include "ui/base/resource/resource_bundle.h" 103 #include "ui/base/resource/resource_bundle.h"
104 #include "webkit/glue/webpreferences.h" 104 #include "webkit/glue/webpreferences.h"
105 #include "webkit/plugins/plugin_switches.h" 105 #include "webkit/plugins/plugin_switches.h"
106 106
107 #if defined(OS_WIN) 107 #if defined(OS_WIN)
108 #include "chrome/browser/chrome_browser_main_win.h" 108 #include "chrome/browser/chrome_browser_main_win.h"
(...skipping 1537 matching lines...) Expand 10 before | Expand all | Expand 10 after
1646 io_thread_application_locale_ = locale; 1646 io_thread_application_locale_ = locale;
1647 } 1647 }
1648 1648
1649 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 1649 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
1650 const std::string& locale) { 1650 const std::string& locale) {
1651 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 1651 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
1652 io_thread_application_locale_ = locale; 1652 io_thread_application_locale_ = locale;
1653 } 1653 }
1654 1654
1655 } // namespace chrome 1655 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm ('k') | chrome/browser/task_manager/task_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698