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

Side by Side Diff: chrome/browser/ui/webui/help/help_handler.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
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 #ifndef CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 void SetUpdateStatus(VersionUpdater::Status status, int progress, 63 void SetUpdateStatus(VersionUpdater::Status status, int progress,
64 const string16& fail_message); 64 const string16& fail_message);
65 65
66 #if defined(OS_MACOSX) 66 #if defined(OS_MACOSX)
67 // Callback method which forwards promotion state to the page. 67 // Callback method which forwards promotion state to the page.
68 void SetPromotionState(VersionUpdater::PromotionState state); 68 void SetPromotionState(VersionUpdater::PromotionState state);
69 #endif 69 #endif
70 70
71 #if defined(OS_CHROMEOS) 71 #if defined(OS_CHROMEOS)
72 // Callbacks from VersionLoader. 72 // Callbacks from VersionLoader.
73 void OnOSVersion(chromeos::VersionLoader::Handle handle, std::string version); 73 void OnOSVersion(chromeos::VersionLoader::Handle handle,
74 const std::string& version);
74 void OnOSFirmware(chromeos::VersionLoader::Handle handle, 75 void OnOSFirmware(chromeos::VersionLoader::Handle handle,
75 std::string firmware); 76 const std::string& firmware);
76 void OnReleaseChannel(const std::string& channel); 77 void OnReleaseChannel(const std::string& channel);
77 78
78 void ProcessLsbFileInfo( 79 void ProcessLsbFileInfo(
79 base::PlatformFileError rv, const base::PlatformFileInfo& file_info); 80 base::PlatformFileError rv, const base::PlatformFileInfo& file_info);
80 #endif 81 #endif
81 82
82 // Specialized instance of the VersionUpdater used to update the browser. 83 // Specialized instance of the VersionUpdater used to update the browser.
83 scoped_ptr<VersionUpdater> version_updater_; 84 scoped_ptr<VersionUpdater> version_updater_;
84 85
85 // Used for callbacks. 86 // Used for callbacks.
86 base::WeakPtrFactory<HelpHandler> weak_factory_; 87 base::WeakPtrFactory<HelpHandler> weak_factory_;
87 88
88 // Used to observe notifications. 89 // Used to observe notifications.
89 content::NotificationRegistrar registrar_; 90 content::NotificationRegistrar registrar_;
90 91
91 #if defined(OS_CHROMEOS) 92 #if defined(OS_CHROMEOS)
92 // Handles asynchronously loading the CrOS version info. 93 // Handles asynchronously loading the CrOS version info.
93 chromeos::VersionLoader loader_; 94 chromeos::VersionLoader loader_;
94 95
95 // Used to request the version. 96 // Used to request the version.
96 CancelableRequestConsumer consumer_; 97 CancelableRequestConsumer consumer_;
97 #endif // defined(OS_CHROMEOS) 98 #endif // defined(OS_CHROMEOS)
98 99
99 DISALLOW_COPY_AND_ASSIGN(HelpHandler); 100 DISALLOW_COPY_AND_ASSIGN(HelpHandler);
100 }; 101 };
101 102
102 #endif // CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_ 103 #endif // CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/register_page_ui.cc ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698