diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/local_discovery/privet_notifications.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/browser_options_handler.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/print_preview/print_preview_handler.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
8 files changed, 5 insertions, 26 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 72c1f1a..7722fd5 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5538,12 +5538,6 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION" desc="Description of the 'Save Page as MHTML' lab."> Enables saving pages as MHTML: a single text file containing HTML and all sub-resources. </message> - <message name="IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_NAME" desc="Title of the 'disable device discovery' flag."> - Disable Device Discovery - </message> - <message name="IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_DESCRIPTION" desc="Description of the 'disable device discovery' flag."> - Disable device discovery on local network. - </message> <message name="IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_NAME" desc="Title of the 'device discovery notificatios' flag."> Device Discovery Notifications </message> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 5b96d2d..f14ff07 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -1358,13 +1358,6 @@ const Experiment kExperiments[] = { }, #if defined(ENABLE_SERVICE_DISCOVERY) { - "disable-device-discovery", - IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_NAME, - IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_DESCRIPTION, - kOsDesktop, - SINGLE_VALUE_TYPE(switches::kDisableDeviceDiscovery) - }, - { "device-discovery-notifications", IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_NAME, IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION, diff --git a/chrome/browser/local_discovery/privet_notifications.cc b/chrome/browser/local_discovery/privet_notifications.cc index 5a009cc..705ccde 100644 --- a/chrome/browser/local_discovery/privet_notifications.cc +++ b/chrome/browser/local_discovery/privet_notifications.cc @@ -225,8 +225,8 @@ void PrivetNotificationService::DeviceCacheFlushed() { // static bool PrivetNotificationService::IsEnabled() { CommandLine* command_line = CommandLine::ForCurrentProcess(); - return !command_line->HasSwitch(switches::kDisableDeviceDiscovery) && - !command_line->HasSwitch(switches::kDisableDeviceDiscoveryNotifications); + return !command_line->HasSwitch( + switches::kDisableDeviceDiscoveryNotifications); } // static diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index b05d5fd..2c8ec46 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -277,9 +277,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, if (url.host() == chrome::kChromeUICrashesHost) return &NewWebUI<CrashesUI>; #if defined(ENABLE_SERVICE_DISCOVERY) - if (url.host() == chrome::kChromeUIDevicesHost && - !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableDeviceDiscovery)) { + if (url.host() == chrome::kChromeUIDevicesHost) { return &NewWebUI<LocalDiscoveryUI>; } #endif diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 5f6285b..0b29dc1 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -173,8 +173,7 @@ BrowserOptionsHandler::BrowserOptionsHandler() #endif #if defined(ENABLE_SERVICE_DISCOVERY) - cloud_print_mdns_ui_enabled_ = !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableDeviceDiscovery); + cloud_print_mdns_ui_enabled_ = true; #endif // defined(ENABLE_SERVICE_DISCOVERY) } diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 6b4961b..558af3b 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -606,8 +606,7 @@ void PrintPreviewHandler::RegisterMessages() { bool PrintPreviewHandler::PrivetPrintingEnabled() { #if defined(ENABLE_SERVICE_DISCOVERY) - return !base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableDeviceDiscovery); + return true; #else return false; #endif diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 17c6b95..43012ba 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -236,9 +236,6 @@ const char kDisableComponentUpdate[] = "disable-component-update"; // automated testing. const char kDisableDefaultApps[] = "disable-default-apps"; -// Disables device discovery. -const char kDisableDeviceDiscovery[] = "disable-device-discovery"; - // Disables device discovery notifications. const char kDisableDeviceDiscoveryNotifications[] = "disable-device-discovery-notifications"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index ce702ed..c4ec483 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -73,7 +73,6 @@ extern const char kDisableClientSidePhishingDetection[]; extern const char kDisableComponentExtensionsWithBackgroundPages[]; extern const char kDisableComponentUpdate[]; extern const char kDisableDefaultApps[]; -extern const char kDisableDeviceDiscovery[]; extern const char kDisableDeviceDiscoveryNotifications[]; extern const char kDisableDnsProbes[]; extern const char kDisableDomainReliability[]; |