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

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: Previous version was wrong 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 112 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
113 #include "chrome/browser/chromeos/login/user_manager.h" 113 #include "chrome/browser/chromeos/login/user_manager.h"
114 #elif defined(OS_LINUX) 114 #elif defined(OS_LINUX)
115 #include "chrome/browser/chrome_browser_main_linux.h" 115 #include "chrome/browser/chrome_browser_main_linux.h"
116 #elif defined(OS_POSIX) 116 #elif defined(OS_POSIX)
117 #include "chrome/browser/chrome_browser_main_posix.h" 117 #include "chrome/browser/chrome_browser_main_posix.h"
118 #endif 118 #endif
119 119
120 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) 120 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID)
121 #include "base/linux_util.h" 121 #include "base/linux_util.h"
122 #include "chrome/browser/crash_handler_host_linuxish.h" 122 #include "chrome/browser/crash_handler_host_linux.h"
123 #endif 123 #endif
124 124
125 #if defined(USE_NSS) 125 #if defined(USE_NSS)
126 #include "chrome/browser/ui/crypto_module_password_dialog.h" 126 #include "chrome/browser/ui/crypto_module_password_dialog.h"
127 #endif 127 #endif
128 128
129 using content::AccessTokenStore; 129 using content::AccessTokenStore;
130 using content::BrowserThread; 130 using content::BrowserThread;
131 using content::BrowserURLHandler; 131 using content::BrowserURLHandler;
132 using content::ChildProcessSecurityPolicy; 132 using content::ChildProcessSecurityPolicy;
(...skipping 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1603 io_thread_application_locale_ = locale; 1603 io_thread_application_locale_ = locale;
1604 } 1604 }
1605 1605
1606 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 1606 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
1607 const std::string& locale) { 1607 const std::string& locale) {
1608 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 1608 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
1609 io_thread_application_locale_ = locale; 1609 io_thread_application_locale_ = locale;
1610 } 1610 }
1611 1611
1612 } // namespace chrome 1612 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698