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

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

Issue 10532178: Rename back _linuxish to linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a typo Created 8 years, 6 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 113 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
114 #include "chrome/browser/chromeos/login/user_manager.h" 114 #include "chrome/browser/chromeos/login/user_manager.h"
115 #elif defined(OS_LINUX) 115 #elif defined(OS_LINUX)
116 #include "chrome/browser/chrome_browser_main_linux.h" 116 #include "chrome/browser/chrome_browser_main_linux.h"
117 #elif defined(OS_POSIX) 117 #elif defined(OS_POSIX)
118 #include "chrome/browser/chrome_browser_main_posix.h" 118 #include "chrome/browser/chrome_browser_main_posix.h"
119 #endif 119 #endif
120 120
121 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) 121 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID)
122 #include "base/linux_util.h" 122 #include "base/linux_util.h"
123 #include "chrome/browser/crash_handler_host_linuxish.h" 123 #include "chrome/browser/crash_handler_host_linux.h"
124 #endif 124 #endif
125 125
126 #if defined(USE_NSS) 126 #if defined(USE_NSS)
127 #include "chrome/browser/ui/crypto_module_password_dialog.h" 127 #include "chrome/browser/ui/crypto_module_password_dialog.h"
128 #endif 128 #endif
129 129
130 using content::AccessTokenStore; 130 using content::AccessTokenStore;
131 using content::BrowserThread; 131 using content::BrowserThread;
132 using content::BrowserURLHandler; 132 using content::BrowserURLHandler;
133 using content::ChildProcessSecurityPolicy; 133 using content::ChildProcessSecurityPolicy;
(...skipping 1512 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/chrome_browser_main_x11.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698