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

Side by Side Diff: chrome/browser/chrome_browser_main_linux.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, 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
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/chrome_browser_main_x11.cc » ('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) 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_browser_main_linux.h" 5 #include "chrome/browser/chrome_browser_main_linux.h"
6 6
7 #if !defined(OS_CHROMEOS) 7 #if !defined(OS_CHROMEOS)
8 #include "chrome/browser/media_gallery/media_device_notifications_linux.h" 8 #include "chrome/browser/media_gallery/media_device_notifications_linux.h"
9 #endif 9 #endif
10 10
11 #if defined(USE_LINUX_BREAKPAD) 11 #if defined(USE_LINUX_BREAKPAD)
12 #include <stdlib.h> 12 #include <stdlib.h>
13 13
14 #include "base/linux_util.h" 14 #include "base/linux_util.h"
15 #include "chrome/app/breakpad_linuxish.h" 15 #include "chrome/app/breakpad_linux.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/common/env_vars.h" 17 #include "chrome/common/env_vars.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 20
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 #include "chrome/browser/chromeos/cros_settings.h" 22 #include "chrome/browser/chromeos/cros_settings.h"
23 #include "chrome/browser/chromeos/cros_settings_names.h" 23 #include "chrome/browser/chromeos/cros_settings_names.h"
24 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/chrome_version_info.h" 25 #include "chrome/common/chrome_version_info.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 #if !defined(OS_CHROMEOS) 92 #if !defined(OS_CHROMEOS)
93 const FilePath kDefaultMtabPath("/etc/mtab"); 93 const FilePath kDefaultMtabPath("/etc/mtab");
94 media_device_notifications_linux_ = 94 media_device_notifications_linux_ =
95 new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath); 95 new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath);
96 media_device_notifications_linux_->Init(); 96 media_device_notifications_linux_->Init();
97 #endif 97 #endif
98 98
99 ChromeBrowserMainPartsPosix::PreProfileInit(); 99 ChromeBrowserMainPartsPosix::PreProfileInit();
100 } 100 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/chrome_browser_main_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698