summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main_linux.h
diff options
context:
space:
mode:
authorrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-15 20:54:06 +0000
committerrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-15 20:54:06 +0000
commitcbf0d1d72e5df6bdf02a9e29e13b3e160a5d2739 (patch)
tree89b0292f92212eb1fd3a314b42d67d8c9c548fe6 /chrome/browser/chrome_browser_main_linux.h
parentf89f58add772d9c9037334d42d8f167123eb372e (diff)
downloadchromium_src-cbf0d1d72e5df6bdf02a9e29e13b3e160a5d2739.zip
chromium_src-cbf0d1d72e5df6bdf02a9e29e13b3e160a5d2739.tar.gz
chromium_src-cbf0d1d72e5df6bdf02a9e29e13b3e160a5d2739.tar.bz2
Set linux distro to CHROMEOS_RELEASE_DESCRIPTION on ChromeOS
This makes ChromeOS more consistent with Linux, which uses the DISTRIB_DESCRIPTION from /etc/lsb-release here. We have a different pre-existing mechanism in the code for reading the value (since ChromeOS doesn't have the lsb_release tool), but it's conceptually the same thing. This makes it possible to search / catagorize ChromeOS crash reports based on the build, or other information about the ChromeOS version. It also allows the matching build/symbols to be more easily found given a crash report. There's no need for Aura customization of distro anymore - that was added when Aura was experimental. All ChromeOS is now Aura. BUG=142630 Review URL: https://chromiumcodereview.appspot.com/10827322 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_linux.h')
-rw-r--r--chrome/browser/chrome_browser_main_linux.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h
index 4f99377..b1d1521 100644
--- a/chrome/browser/chrome_browser_main_linux.h
+++ b/chrome/browser/chrome_browser_main_linux.h
@@ -9,8 +9,13 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
+#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/chrome_browser_main_posix.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/version_loader.h"
+#endif
+
#if !defined(OS_CHROMEOS)
namespace chrome {
class MediaDeviceNotificationsLinux;
@@ -33,6 +38,11 @@ class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix {
media_device_notifications_linux_;
#endif
+#if defined(OS_CHROMEOS)
+ chromeos::VersionLoader cros_version_loader_;
+ CancelableRequestConsumer cros_consumer_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsLinux);
};