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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/linux_util.cc ('k') | chrome/browser/chrome_browser_main_linux.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 // Contains functions used by BrowserMain() that are linux-specific. 5 // Contains functions used by BrowserMain() that are linux-specific.
6 6
7 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_LINUX_H_ 7 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_LINUX_H_
8 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_LINUX_H_ 8 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_LINUX_H_
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "chrome/browser/cancelable_request.h"
12 #include "chrome/browser/chrome_browser_main_posix.h" 13 #include "chrome/browser/chrome_browser_main_posix.h"
13 14
15 #if defined(OS_CHROMEOS)
16 #include "chrome/browser/chromeos/version_loader.h"
17 #endif
18
14 #if !defined(OS_CHROMEOS) 19 #if !defined(OS_CHROMEOS)
15 namespace chrome { 20 namespace chrome {
16 class MediaDeviceNotificationsLinux; 21 class MediaDeviceNotificationsLinux;
17 } 22 }
18 #endif 23 #endif
19 24
20 class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix { 25 class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix {
21 public: 26 public:
22 explicit ChromeBrowserMainPartsLinux( 27 explicit ChromeBrowserMainPartsLinux(
23 const content::MainFunctionParams& parameters); 28 const content::MainFunctionParams& parameters);
24 virtual ~ChromeBrowserMainPartsLinux(); 29 virtual ~ChromeBrowserMainPartsLinux();
25 30
26 // ChromeBrowserMainParts overrides. 31 // ChromeBrowserMainParts overrides.
27 virtual void PreProfileInit() OVERRIDE; 32 virtual void PreProfileInit() OVERRIDE;
28 virtual void PostMainMessageLoopRun() OVERRIDE; 33 virtual void PostMainMessageLoopRun() OVERRIDE;
29 34
30 private: 35 private:
31 #if !defined(OS_CHROMEOS) 36 #if !defined(OS_CHROMEOS)
32 scoped_refptr<chrome::MediaDeviceNotificationsLinux> 37 scoped_refptr<chrome::MediaDeviceNotificationsLinux>
33 media_device_notifications_linux_; 38 media_device_notifications_linux_;
34 #endif 39 #endif
35 40
41 #if defined(OS_CHROMEOS)
42 chromeos::VersionLoader cros_version_loader_;
43 CancelableRequestConsumer cros_consumer_;
44 #endif
45
36 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsLinux); 46 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsLinux);
37 }; 47 };
38 48
39 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_LINUX_H_ 49 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_LINUX_H_
OLDNEW
« 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