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

Unified Diff: chrome/browser/chrome_browser_main_linux.h

Issue 10827322: Set linux distro to CHROMEOS_RELEASE_DESCRIPTION on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk and switch to const-ref string params in version loader callbacks Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/linux_util.cc ('k') | chrome/browser/chrome_browser_main_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main_linux.h
diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h
index 4f993778919fc4c5dabee75d77dfd2aaaf80b814..b1d1521011abcfdf0e65187c4e83a85f13cc51a7 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);
};
« no previous file with comments | « base/linux_util.cc ('k') | chrome/browser/chrome_browser_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698