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

Unified Diff: chrome/browser/task_manager/web_contents_tags.cc

Issue 2558143002: Remove the enable_task_manager build flag and define. (Closed)
Patch Set: Includes Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/task_manager/web_contents_tags.cc
diff --git a/chrome/browser/task_manager/web_contents_tags.cc b/chrome/browser/task_manager/web_contents_tags.cc
index 8352b7bd681184f322ccaded61bd593a75ad51b1..ce2f04bd1825d37a8dbbbddf33910fa5e5e0e6f0 100644
--- a/chrome/browser/task_manager/web_contents_tags.cc
+++ b/chrome/browser/task_manager/web_contents_tags.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/task_manager/web_contents_tags.h"
+#include "build/build_config.h"
#include "chrome/browser/task_manager/providers/web_contents/background_contents_tag.h"
#include "chrome/browser/task_manager/providers/web_contents/devtools_tag.h"
#include "chrome/browser/task_manager/providers/web_contents/extension_tag.h"
@@ -24,7 +25,7 @@
namespace task_manager {
-#if defined(ENABLE_TASK_MANAGER)
+#if !defined(OS_ANDROID)
namespace {
// Adds the |tag| to |contents|. It also adds the |tag| to the
@@ -57,86 +58,87 @@ bool IsExtensionWebContents(content::WebContents* contents) {
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
} // namespace
-#endif // defined(ENABLE_TASK_MANAGER)
+
+#endif // !defined(OS_ANDROID)
// static
void WebContentsTags::CreateForBackgroundContents(
content::WebContents* web_contents,
BackgroundContents* background_contents) {
-#if defined(ENABLE_TASK_MANAGER)
+#if !defined(OS_ANDROID)
if (!WebContentsTag::FromWebContents(web_contents)) {
TagWebContents(
web_contents,
new BackgroundContentsTag(web_contents, background_contents),
WebContentsTag::kTagKey);
}
-#endif // defined(ENABLE_TASK_MANAGER)
+#endif // !defined(OS_ANDROID)
}
// static
void WebContentsTags::CreateForDevToolsContents(
content::WebContents* web_contents) {
-#if defined(ENABLE_TASK_MANAGER)
+#if !defined(OS_ANDROID)
if (!WebContentsTag::FromWebContents(web_contents)) {
TagWebContents(web_contents,
new DevToolsTag(web_contents),
WebContentsTag::kTagKey);
}
-#endif // defined(ENABLE_TASK_MANAGER)
+#endif // !defined(OS_ANDROID)
}
// static
void WebContentsTags::CreateForPrerenderContents(
content::WebContents* web_contents) {
-#if defined(ENABLE_TASK_MANAGER)
+#if !defined(OS_ANDROID)
if (!WebContentsTag::FromWebContents(web_contents)) {
TagWebContents(web_contents,
new PrerenderTag(web_contents),
WebContentsTag::kTagKey);
}
-#endif // defined(ENABLE_TASK_MANAGER)
+#endif // !defined(OS_ANDROID)
}
// static
void WebContentsTags::CreateForTabContents(content::WebContents* web_contents) {
-#if defined(ENABLE_TASK_MANAGER)
+#if !defined(OS_ANDROID)
if (!WebContentsTag::FromWebContents(web_contents)) {
TagWebContents(web_contents,
new TabContentsTag(web_contents),
WebContentsTag::kTagKey);
}
-#endif // defined(ENABLE_TASK_MANAGER)
+#endif // !defined(OS_ANDROID)
}
// static
void WebContentsTags::CreateForPrintingContents(
content::WebContents* web_contents) {
-#if defined(ENABLE_TASK_MANAGER) && BUILDFLAG(ENABLE_PRINT_PREVIEW)
+#if !defined(OS_ANDROID) && BUILDFLAG(ENABLE_PRINT_PREVIEW)
if (!WebContentsTag::FromWebContents(web_contents)) {
TagWebContents(web_contents,
new PrintingTag(web_contents),
WebContentsTag::kTagKey);
}
-#endif // defined(ENABLE_TASK_MANAGER) && BUILDFLAG(ENABLE_PRINT_PREVIEW)
+#endif // !defined(OS_ANDROID) && BUILDFLAG(ENABLE_PRINT_PREVIEW)
}
// static
void WebContentsTags::CreateForGuestContents(
content::WebContents* web_contents) {
-#if defined(ENABLE_TASK_MANAGER)
+#if !defined(OS_ANDROID)
DCHECK(guest_view::GuestViewBase::IsGuest(web_contents));
if (!WebContentsTag::FromWebContents(web_contents)) {
TagWebContents(web_contents,
new GuestTag(web_contents),
WebContentsTag::kTagKey);
}
-#endif // defined(ENABLE_TASK_MANAGER)
+#endif // !defined(OS_ANDROID)
}
// static
void WebContentsTags::CreateForExtension(content::WebContents* web_contents,
extensions::ViewType view_type) {
-#if defined(ENABLE_TASK_MANAGER) && BUILDFLAG(ENABLE_EXTENSIONS)
+#if !defined(OS_ANDROID) && BUILDFLAG(ENABLE_EXTENSIONS)
DCHECK(IsExtensionWebContents(web_contents));
if (!WebContentsTag::FromWebContents(web_contents)) {
@@ -144,16 +146,16 @@ void WebContentsTags::CreateForExtension(content::WebContents* web_contents,
new ExtensionTag(web_contents, view_type),
WebContentsTag::kTagKey);
}
-#endif // defined(ENABLE_TASK_MANAGER) && BUILDFLAG(ENABLE_EXTENSIONS)
+#endif // !defined(OS_ANDROID) && BUILDFLAG(ENABLE_EXTENSIONS)
}
// static
void WebContentsTags::ClearTag(content::WebContents* web_contents) {
-#if defined(ENABLE_TASK_MANAGER)
+#if !defined(OS_ANDROID)
const WebContentsTag* tag = WebContentsTag::FromWebContents(web_contents);
WebContentsTagsManager::GetInstance()->ClearFromProvider(tag);
web_contents->RemoveUserData(WebContentsTag::kTagKey);
-#endif // defined(ENABLE_TASK_MANAGER)
+#endif // !defined(OS_ANDROID)
}
} // namespace task_manager
« no previous file with comments | « chrome/browser/printing/print_preview_dialog_controller_browsertest.cc ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698