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

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: 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_browser_main_linux.h" 5 #include "chrome/browser/chrome_browser_main_linux.h"
6 6
7 #include "chrome/browser/media_gallery/media_device_notifications_linux.h" 7 #include "chrome/browser/media_gallery/media_device_notifications_linux.h"
8 8
9 #if defined(USE_LINUX_BREAKPAD) 9 #if defined(USE_LINUX_BREAKPAD)
10 #include <stdlib.h> 10 #include <stdlib.h>
11 11
12 #include "base/linux_util.h" 12 #include "base/linux_util.h"
13 #include "chrome/app/breakpad_linuxish.h" 13 #include "chrome/app/breakpad_linux.h"
14 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
15 #include "chrome/common/env_vars.h" 15 #include "chrome/common/env_vars.h"
16 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
17 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
18 18
19 #if defined(OS_CHROMEOS) 19 #if defined(OS_CHROMEOS)
20 #include "chrome/browser/chromeos/cros_settings.h" 20 #include "chrome/browser/chromeos/cros_settings.h"
21 #include "chrome/browser/chromeos/cros_settings_names.h" 21 #include "chrome/browser/chromeos/cros_settings_names.h"
22 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/chrome_version_info.h" 23 #include "chrome/common/chrome_version_info.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 InitCrashReporter(); 87 InitCrashReporter();
88 #endif 88 #endif
89 89
90 const FilePath kDefaultMtabPath("/etc/mtab"); 90 const FilePath kDefaultMtabPath("/etc/mtab");
91 media_device_notifications_linux_ = 91 media_device_notifications_linux_ =
92 new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath); 92 new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath);
93 media_device_notifications_linux_->Init(); 93 media_device_notifications_linux_->Init();
94 94
95 ChromeBrowserMainPartsPosix::PreProfileInit(); 95 ChromeBrowserMainPartsPosix::PreProfileInit();
96 } 96 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698