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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/common/chrome_switches.h" 43 #include "chrome/common/chrome_switches.h"
44 #include "chrome/common/time_format.h" 44 #include "chrome/common/time_format.h"
45 #include "content/public/browser/notification_service.h" 45 #include "content/public/browser/notification_service.h"
46 #include "grit/chromium_strings.h" 46 #include "grit/chromium_strings.h"
47 #include "grit/generated_resources.h" 47 #include "grit/generated_resources.h"
48 #include "grit/locale_settings.h" 48 #include "grit/locale_settings.h"
49 #include "grit/theme_resources.h" 49 #include "grit/theme_resources.h"
50 #include "third_party/skia/include/core/SkBitmap.h" 50 #include "third_party/skia/include/core/SkBitmap.h"
51 #include "ui/base/l10n/l10n_util.h" 51 #include "ui/base/l10n/l10n_util.h"
52 #include "ui/base/resource/resource_bundle.h" 52 #include "ui/base/resource/resource_bundle.h"
53 #include "views/widget/widget.h" 53 #include "ui/views/widget/widget.h"
54 54
55 static const char kOtherNetworksFakePath[] = "?"; 55 static const char kOtherNetworksFakePath[] = "?";
56 56
57 InternetOptionsHandler::InternetOptionsHandler() 57 InternetOptionsHandler::InternetOptionsHandler()
58 : chromeos::CrosOptionsPageUIHandler(NULL) { 58 : chromeos::CrosOptionsPageUIHandler(NULL) {
59 registrar_.Add(this, chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED, 59 registrar_.Add(this, chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED,
60 content::NotificationService::AllSources()); 60 content::NotificationService::AllSources());
61 registrar_.Add(this, chrome::NOTIFICATION_ENTER_PIN_ENDED, 61 registrar_.Add(this, chrome::NOTIFICATION_ENTER_PIN_ENDED,
62 content::NotificationService::AllSources()); 62 content::NotificationService::AllSources());
63 cros_ = chromeos::CrosLibrary::Get()->GetNetworkLibrary(); 63 cros_ = chromeos::CrosLibrary::Get()->GetNetworkLibrary();
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 dictionary->Set("wirelessList", GetWirelessList()); 1290 dictionary->Set("wirelessList", GetWirelessList());
1291 dictionary->Set("vpnList", GetVPNList()); 1291 dictionary->Set("vpnList", GetVPNList());
1292 dictionary->Set("rememberedList", GetRememberedList()); 1292 dictionary->Set("rememberedList", GetRememberedList());
1293 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available()); 1293 dictionary->SetBoolean("wifiAvailable", cros_->wifi_available());
1294 dictionary->SetBoolean("wifiBusy", cros_->wifi_busy()); 1294 dictionary->SetBoolean("wifiBusy", cros_->wifi_busy());
1295 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled()); 1295 dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled());
1296 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available()); 1296 dictionary->SetBoolean("cellularAvailable", cros_->cellular_available());
1297 dictionary->SetBoolean("cellularBusy", cros_->cellular_busy()); 1297 dictionary->SetBoolean("cellularBusy", cros_->cellular_busy());
1298 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled()); 1298 dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled());
1299 } 1299 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698