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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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/options/chromeos/internet_options_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
6 6
7 #include <ctype.h> 7 #include <ctype.h>
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "ash/shell_delegate.h" 14 #include "ash/shell_delegate.h"
15 #include "base/base64.h" 15 #include "base/base64.h"
16 #include "base/basictypes.h" 16 #include "base/basictypes.h"
17 #include "base/bind.h" 17 #include "base/bind.h"
18 #include "base/bind_helpers.h" 18 #include "base/bind_helpers.h"
19 #include "base/command_line.h" 19 #include "base/command_line.h"
20 #include "base/i18n/time_formatting.h" 20 #include "base/i18n/time_formatting.h"
21 #include "base/json/json_writer.h" 21 #include "base/json/json_writer.h"
22 #include "base/string16.h" 22 #include "base/string16.h"
23 #include "base/stringprintf.h" 23 #include "base/stringprintf.h"
24 #include "base/strings/string_number_conversions.h" 24 #include "base/strings/string_number_conversions.h"
25 #include "base/strings/utf_string_conversions.h"
25 #include "base/time.h" 26 #include "base/time.h"
26 #include "base/utf_string_conversions.h"
27 #include "base/values.h" 27 #include "base/values.h"
28 #include "chrome/browser/browser_process.h" 28 #include "chrome/browser/browser_process.h"
29 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" 29 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
30 #include "chrome/browser/chromeos/cros/cros_library.h" 30 #include "chrome/browser/chromeos/cros/cros_library.h"
31 #include "chrome/browser/chromeos/cros/network_library.h" 31 #include "chrome/browser/chromeos/cros/network_library.h"
32 #include "chrome/browser/chromeos/cros/network_property_ui_data.h" 32 #include "chrome/browser/chromeos/cros/network_property_ui_data.h"
33 #include "chrome/browser/chromeos/enrollment_dialog_view.h" 33 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
34 #include "chrome/browser/chromeos/mobile_config.h" 34 #include "chrome/browser/chromeos/mobile_config.h"
35 #include "chrome/browser/chromeos/options/network_config_view.h" 35 #include "chrome/browser/chromeos/options/network_config_view.h"
36 #include "chrome/browser/chromeos/options/network_connect.h" 36 #include "chrome/browser/chromeos/options/network_connect.h"
(...skipping 1748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1785 1785
1786 dictionary->SetBoolean(kTagWimaxEnabled, cros_->wimax_enabled()); 1786 dictionary->SetBoolean(kTagWimaxEnabled, cros_->wimax_enabled());
1787 dictionary->SetBoolean(kTagWimaxAvailable, cros_->wimax_available()); 1787 dictionary->SetBoolean(kTagWimaxAvailable, cros_->wimax_available());
1788 dictionary->SetBoolean(kTagWimaxBusy, false); // TODO(stevenj) remove. 1788 dictionary->SetBoolean(kTagWimaxBusy, false); // TODO(stevenj) remove.
1789 // TODO(kevers): The use of 'offline_mode' is not quite correct. Update once 1789 // TODO(kevers): The use of 'offline_mode' is not quite correct. Update once
1790 // we have proper back-end support. TODO(stevenj) remove. 1790 // we have proper back-end support. TODO(stevenj) remove.
1791 dictionary->SetBoolean(kTagAirplaneMode, cros_->offline_mode()); 1791 dictionary->SetBoolean(kTagAirplaneMode, cros_->offline_mode());
1792 } 1792 }
1793 1793
1794 } // namespace options 1794 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698