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

Side by Side Diff: chrome/browser/ui/webui/help/help_handler.h

Issue 780203002: Fix threading bugs in product label UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address satorux's comments Created 6 years 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
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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 void SetPromotionState(VersionUpdater::PromotionState state); 84 void SetPromotionState(VersionUpdater::PromotionState state);
85 #endif 85 #endif
86 86
87 #if defined(OS_CHROMEOS) 87 #if defined(OS_CHROMEOS)
88 // Callbacks from VersionLoader. 88 // Callbacks from VersionLoader.
89 void OnOSVersion(const std::string& version); 89 void OnOSVersion(const std::string& version);
90 void OnOSFirmware(const std::string& firmware); 90 void OnOSFirmware(const std::string& firmware);
91 void OnCurrentChannel(const std::string& channel); 91 void OnCurrentChannel(const std::string& channel);
92 void OnTargetChannel(const std::string& channel); 92 void OnTargetChannel(const std::string& channel);
93 93
94 // Callback for loading FCC label alt text. 94 // Callback for setting the FCC label alt text.
95 void LoadFCCLabelText(); 95 void OnFCCLabelTextRead(std::string text);
satorux1 2014/12/09 05:56:41 const std::string&
michaelpg 2014/12/10 00:48:51 Done.
96 #endif 96 #endif
97 97
98 // Specialized instance of the VersionUpdater used to update the browser. 98 // Specialized instance of the VersionUpdater used to update the browser.
99 scoped_ptr<VersionUpdater> version_updater_; 99 scoped_ptr<VersionUpdater> version_updater_;
100 100
101 // Used to observe notifications. 101 // Used to observe notifications.
102 content::NotificationRegistrar registrar_; 102 content::NotificationRegistrar registrar_;
103 103
104 #if defined(OS_CHROMEOS) 104 #if defined(OS_CHROMEOS)
105 // Handles asynchronously loading the CrOS version info. 105 // Handles asynchronously loading the CrOS version info.
106 chromeos::VersionLoader loader_; 106 chromeos::VersionLoader loader_;
107 107
108 // Used to request the version. 108 // Used to request the version.
109 base::CancelableTaskTracker tracker_; 109 base::CancelableTaskTracker tracker_;
110 #endif // defined(OS_CHROMEOS) 110 #endif // defined(OS_CHROMEOS)
111 111
112 // Used for callbacks. 112 // Used for callbacks.
113 base::WeakPtrFactory<HelpHandler> weak_factory_; 113 base::WeakPtrFactory<HelpHandler> weak_factory_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(HelpHandler); 115 DISALLOW_COPY_AND_ASSIGN(HelpHandler);
116 }; 116 };
117 117
118 #endif // CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_ 118 #endif // CHROME_BROWSER_UI_WEBUI_HELP_HELP_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698