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

Side by Side Diff: chrome/browser/ui/webui/help/version_updater_chromeos.cc

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. 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 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h" 5 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "chrome/browser/chromeos/cros_settings.h"
12 #include "chrome/browser/chromeos/cros_settings_names.h"
13 #include "chrome/browser/chromeos/login/user_manager.h" 11 #include "chrome/browser/chromeos/login/user_manager.h"
14 #include "chrome/browser/chromeos/login/wizard_controller.h" 12 #include "chrome/browser/chromeos/login/wizard_controller.h"
13 #include "chrome/browser/chromeos/settings/cros_settings.h"
14 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
15 #include "chromeos/dbus/dbus_thread_manager.h" 15 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "chromeos/dbus/power_manager_client.h" 16 #include "chromeos/dbus/power_manager_client.h"
17 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 19
20 using chromeos::CrosSettings; 20 using chromeos::CrosSettings;
21 using chromeos::DBusThreadManager; 21 using chromeos::DBusThreadManager;
22 using chromeos::UpdateEngineClient; 22 using chromeos::UpdateEngineClient;
23 using chromeos::UserManager; 23 using chromeos::UserManager;
24 using chromeos::WizardController; 24 using chromeos::WizardController;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 UpdateEngineClient::UpdateCheckResult result) { 133 UpdateEngineClient::UpdateCheckResult result) {
134 // If version updating is not implemented, this binary is the most up-to-date 134 // If version updating is not implemented, this binary is the most up-to-date
135 // possible with respect to automatic updating. 135 // possible with respect to automatic updating.
136 if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED) 136 if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED)
137 callback_.Run(UPDATED, 0, string16()); 137 callback_.Run(UPDATED, 0, string16());
138 } 138 }
139 139
140 void VersionUpdaterCros::UpdateSelectedChannel(const std::string& channel) { 140 void VersionUpdaterCros::UpdateSelectedChannel(const std::string& channel) {
141 channel_callback_.Run(channel); 141 channel_callback_.Run(channel);
142 } 142 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/help/help_handler.cc ('k') | chrome/browser/ui/webui/options2/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698