Commit 05fe2faf authored by Julian Pastarmov's avatar Julian Pastarmov Committed by Commit Bot

Remove chrome://flash page.

All information on this page is duplicate of information from other
sources.
The Flash plugin version and path can be found on chrome://version.
GPU information is present of chrome://gpu and crashes on chrome://crashes.

BUG=615739

Change-Id: Ic0dce75db63099715145a63cac82316494a87b12
Reviewed-on: https://chromium-review.googlesource.com/c/1373841Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Commit-Queue: Julian Pastarmov <pastarmovj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#616047}
parent 07da7abb
...@@ -4670,14 +4670,6 @@ Keep your key file in a safe place. You will need it to create new versions of y ...@@ -4670,14 +4670,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message> </message>
</if> </if>
<!-- chrome://flash strings -->
<message name="IDS_FLASH_LOADING_MESSAGE" desc="Shown while loading until full list of modules is retrieved">
Loading...
</message>
<message name="IDS_FLASH_TITLE_MESSAGE" desc="Shown while loading until full list of modules is retrieved. 'Flash' is the name of a plugin and should not be translated.">
About Flash
</message>
<!-- NaCl plugin strings --> <!-- NaCl plugin strings -->
<message name="IDS_NACL_APP_MISSING_ARCH_MESSAGE" desc="Shown if a Native Client app does not support the current architecture"> <message name="IDS_NACL_APP_MISSING_ARCH_MESSAGE" desc="Shown if a Native Client app does not support the current architecture">
This page uses a Native Client app that doesn't work on your computer. This page uses a Native Client app that doesn't work on your computer.
......
...@@ -3435,8 +3435,6 @@ jumbo_split_static_library("ui") { ...@@ -3435,8 +3435,6 @@ jumbo_split_static_library("ui") {
sources += [ sources += [
"hung_plugin_tab_helper.cc", "hung_plugin_tab_helper.cc",
"hung_plugin_tab_helper.h", "hung_plugin_tab_helper.h",
"webui/flash_ui.cc",
"webui/flash_ui.h",
] ]
deps += [ "//ppapi/proxy:ipc" ] deps += [ "//ppapi/proxy:ipc" ]
} }
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "chrome/browser/ui/webui/download_internals/download_internals_ui.h" #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h"
#include "chrome/browser/ui/webui/engagement/site_engagement_ui.h" #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h"
#include "chrome/browser/ui/webui/flags_ui.h" #include "chrome/browser/ui/webui/flags_ui.h"
#include "chrome/browser/ui/webui/flash_ui.h"
#include "chrome/browser/ui/webui/gcm_internals_ui.h" #include "chrome/browser/ui/webui/gcm_internals_ui.h"
#include "chrome/browser/ui/webui/hats/hats_ui.h" #include "chrome/browser/ui/webui/hats/hats_ui.h"
#include "chrome/browser/ui/webui/identity_internals_ui.h" #include "chrome/browser/ui/webui/identity_internals_ui.h"
...@@ -603,10 +602,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, ...@@ -603,10 +602,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
if (url.host_piece() == chrome::kChromeUIExtensionsFrameHost) if (url.host_piece() == chrome::kChromeUIExtensionsFrameHost)
return &NewWebUI<extensions::ExtensionsUI>; return &NewWebUI<extensions::ExtensionsUI>;
#endif #endif
#if BUILDFLAG(ENABLE_PLUGINS)
if (url.host_piece() == chrome::kChromeUIFlashHost)
return &NewWebUI<FlashUI>;
#endif
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
if (url.host_piece() == chrome::kChromeUIPrintHost && if (url.host_piece() == chrome::kChromeUIPrintHost &&
!profile->GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled)) { !profile->GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled)) {
...@@ -861,10 +856,6 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( ...@@ -861,10 +856,6 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
if (page_url.host_piece() == chrome::kChromeUIBookmarksHost) if (page_url.host_piece() == chrome::kChromeUIBookmarksHost)
return MdBookmarksUI::GetFaviconResourceBytes(scale_factor); return MdBookmarksUI::GetFaviconResourceBytes(scale_factor);
// Flash is not available on android.
if (page_url.host_piece() == chrome::kChromeUIFlashHost)
return FlashUI::GetFaviconResourceBytes(scale_factor);
// Android uses the native download manager. // Android uses the native download manager.
if (page_url.host_piece() == chrome::kChromeUIDownloadsHost) if (page_url.host_piece() == chrome::kChromeUIDownloadsHost)
return MdDownloadsUI::GetFaviconResourceBytes(scale_factor); return MdDownloadsUI::GetFaviconResourceBytes(scale_factor);
......
This diff is collapsed.
// 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.
#ifndef CHROME_BROWSER_UI_WEBUI_FLASH_UI_H_
#define CHROME_BROWSER_UI_WEBUI_FLASH_UI_H_
#include "base/macros.h"
#include "content/public/browser/web_ui_controller.h"
#include "ui/base/layout.h"
namespace base {
class RefCountedMemory;
}
// The Web UI handler for about:flash.
class FlashUI : public content::WebUIController {
public:
explicit FlashUI(content::WebUI* web_ui);
static base::RefCountedMemory* GetFaviconResourceBytes(
ui::ScaleFactor scale_factor);
private:
DISALLOW_COPY_AND_ASSIGN(FlashUI);
};
#endif // CHROME_BROWSER_UI_WEBUI_FLASH_UI_H_
...@@ -73,7 +73,6 @@ const char kChromeUIFaviconHost[] = "favicon"; ...@@ -73,7 +73,6 @@ const char kChromeUIFaviconHost[] = "favicon";
const char kChromeUIFaviconURL[] = "chrome://favicon/"; const char kChromeUIFaviconURL[] = "chrome://favicon/";
const char kChromeUIFlagsHost[] = "flags"; const char kChromeUIFlagsHost[] = "flags";
const char kChromeUIFlagsURL[] = "chrome://flags/"; const char kChromeUIFlagsURL[] = "chrome://flags/";
const char kChromeUIFlashHost[] = "flash";
const char kChromeUIGCMInternalsHost[] = "gcm-internals"; const char kChromeUIGCMInternalsHost[] = "gcm-internals";
const char kChromeUIHangUIHost[] = "uithreadhang"; const char kChromeUIHangUIHost[] = "uithreadhang";
const char kChromeUIHelpHost[] = "help"; const char kChromeUIHelpHost[] = "help";
...@@ -386,7 +385,6 @@ const char* const kChromeHostURLs[] = { ...@@ -386,7 +385,6 @@ const char* const kChromeHostURLs[] = {
#endif #endif
kChromeUIBookmarksHost, kChromeUIBookmarksHost,
kChromeUIDownloadsHost, kChromeUIDownloadsHost,
kChromeUIFlashHost,
kChromeUIHelpHost, kChromeUIHelpHost,
kChromeUIInspectHost, kChromeUIInspectHost,
kChromeUISettingsHost, kChromeUISettingsHost,
......
...@@ -78,7 +78,6 @@ extern const char kChromeUIFaviconHost[]; ...@@ -78,7 +78,6 @@ extern const char kChromeUIFaviconHost[];
extern const char kChromeUIFaviconURL[]; extern const char kChromeUIFaviconURL[];
extern const char kChromeUIFlagsHost[]; extern const char kChromeUIFlagsHost[];
extern const char kChromeUIFlagsURL[]; extern const char kChromeUIFlagsURL[];
extern const char kChromeUIFlashHost[];
extern const char kChromeUIGCMInternalsHost[]; extern const char kChromeUIGCMInternalsHost[];
extern const char kChromeUIHangUIHost[]; extern const char kChromeUIHangUIHost[];
extern const char kChromeUIHelpHost[]; extern const char kChromeUIHelpHost[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment