Move Chrome OS switches to chromeos/chromeos_switches.cc

chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 28 matching lines @@
 #include "chrome/browser/chromeos/status/network_menu_icon.h"
 #include "chrome/browser/net/pref_proxy_config_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/time_format.h"
+#include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_ip_config.h"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 1279 matching lines @@
 
   // Only show proxy for remembered networks.
   chromeos::NetworkProfileType network_profile = network->profile_type();
   dictionary.SetBoolean(kTagShowProxy,
                         network_profile != chromeos::PROFILE_NONE);
 
   // Enable static ip config for ethernet. For wifi, enable if flag is set.
   bool staticIPConfig = type == chromeos::TYPE_ETHERNET ||
       (type == chromeos::TYPE_WIFI &&
        CommandLine::ForCurrentProcess()->HasSwitch(
-           switches::kEnableStaticIPConfig));
+           chromeos::switches::kEnableStaticIPConfig));
   dictionary.SetBoolean(kTagShowStaticIPConfig, staticIPConfig);
 
   dictionary.SetBoolean(kTagShowPreferred,
                         network_profile == chromeos::PROFILE_USER);
   SetValueDictionary(&dictionary, kTagPreferred,
                      new base::FundamentalValue(network->preferred()),
                      property_ui_data);
 
   chromeos::NetworkPropertyUIData auto_connect_ui_data(ui_data);
   std::string onc_path_to_auto_connect;
@@ skipping 95 matching lines @@
   dictionary->SetString(kTagLocalizedName, apn.localized_name);
   dictionary->SetString(kTagLanguage, apn.language);
   return dictionary;
 }
 
 void InternetOptionsHandler::PopulateCellularDetails(
     const chromeos::CellularNetwork* cellular,
     DictionaryValue* dictionary) {
   dictionary->SetBoolean(kTagCarrierSelectFlag,
                          CommandLine::ForCurrentProcess()->HasSwitch(
-                             switches::kEnableCarrierSwitching));
+                             chromeos::switches::kEnableCarrierSwitching));
   // Cellular network / connection settings.
   dictionary->SetString(kTagServiceName, cellular->name());
   dictionary->SetString(kTagNetworkTechnology,
                         cellular->GetNetworkTechnologyString());
   dictionary->SetString(kTagOperatorName, cellular->operator_name());
   dictionary->SetString(kTagOperatorCode, cellular->operator_code());
   dictionary->SetString(kTagActivationState,
                         cellular->GetActivationStateString());
   dictionary->SetString(kTagRoamingState,
                         cellular->GetRoamingStateString());
@@ skipping 49 matching lines @@
     const chromeos::CellularApnList& apn_list = device->provider_apn_list();
     ListValue* apn_list_value = new ListValue();
     for (chromeos::CellularApnList::const_iterator it = apn_list.begin();
          it != apn_list.end(); ++it) {
       apn_list_value->Append(CreateDictionaryFromCellularApn(*it));
     }
     SetValueDictionary(dictionary, kTagProviderApnList, apn_list_value,
                        cellular_property_ui_data);
 
     if (CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableCarrierSwitching)) {
+            chromeos::switches::kEnableCarrierSwitching)) {
       base::ListValue* supported_carriers = device->supported_carriers();
       if (supported_carriers) {
         dictionary->Set(kTagCarriers, supported_carriers->DeepCopy());
         dictionary->SetInteger(kTagCurrentCarrierIndex,
                                FindCurrentCarrierIndex(supported_carriers,
                                                        device));
       } else {
         // In case of any error, set the current carrier tag to -1 indicating
         // to the JS code to fallback to a single carrier.
         dictionary->SetInteger(kTagCurrentCarrierIndex, -1);
@@ skipping 316 matching lines @@
 
   dictionary->SetBoolean(kTagWimaxEnabled, cros_->wimax_enabled());
   dictionary->SetBoolean(kTagWimaxAvailable, cros_->wimax_available());
   dictionary->SetBoolean(kTagWimaxBusy, cros_->wimax_busy());
   // TODO(kevers): The use of 'offline_mode' is not quite correct.  Update once
   // we have proper back-end support.
   dictionary->SetBoolean(kTagAirplaneMode, cros_->offline_mode());
 }
 
 }  // namespace options