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

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

Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
« no previous file with comments | « chrome/browser/chrome_browser_main_linux.h ('k') | chrome/browser/chrome_browser_main_mac.h » ('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 #include <fontconfig/fontconfig.h> 7 #include <fontconfig/fontconfig.h>
8 8
9 #include "build/build_config.h"
9 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
10 #include "chrome/grit/chromium_strings.h" 11 #include "chrome/grit/chromium_strings.h"
11 #include "components/crash/content/app/breakpad_linux.h" 12 #include "components/crash/content/app/breakpad_linux.h"
12 #include "components/metrics/metrics_service.h" 13 #include "components/metrics/metrics_service.h"
13 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 14 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
14 #include "device/bluetooth/dbus/dbus_thread_manager_linux.h" 15 #include "device/bluetooth/dbus/dbus_thread_manager_linux.h"
15 #include "media/audio/audio_manager.h" 16 #include "media/audio/audio_manager.h"
16 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
17 18
18 #if !defined(OS_CHROMEOS) 19 #if !defined(OS_CHROMEOS)
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } 77 }
77 78
78 void ChromeBrowserMainPartsLinux::PostDestroyThreads() { 79 void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
79 #if !defined(OS_CHROMEOS) 80 #if !defined(OS_CHROMEOS)
80 bluez::BluezDBusManager::Shutdown(); 81 bluez::BluezDBusManager::Shutdown();
81 bluez::DBusThreadManagerLinux::Shutdown(); 82 bluez::DBusThreadManagerLinux::Shutdown();
82 #endif 83 #endif
83 84
84 ChromeBrowserMainPartsPosix::PostDestroyThreads(); 85 ChromeBrowserMainPartsPosix::PostDestroyThreads();
85 } 86 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_linux.h ('k') | chrome/browser/chrome_browser_main_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698