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

Unified Diff: chrome/browser/renderer_host/chrome_navigation_ui_data.cc

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_host/chrome_navigation_ui_data.cc
diff --git a/chrome/browser/renderer_host/chrome_navigation_ui_data.cc b/chrome/browser/renderer_host/chrome_navigation_ui_data.cc
index cffc26b69a09c795f2632fe1f2b96cb444bc5fe3..4bec1bcfe67c1f57a15d1f28ca6482d07b953a80 100644
--- a/chrome/browser/renderer_host/chrome_navigation_ui_data.cc
+++ b/chrome/browser/renderer_host/chrome_navigation_ui_data.cc
@@ -7,12 +7,13 @@
#include "base/memory/ptr_util.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "content/public/browser/navigation_handle.h"
+#include "extensions/features/features.h"
ChromeNavigationUIData::ChromeNavigationUIData() {}
ChromeNavigationUIData::ChromeNavigationUIData(
content::NavigationHandle* navigation_handle) {
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
SessionTabHelper* session_tab_helper =
SessionTabHelper::FromWebContents(navigation_handle->GetWebContents());
int tab_id = session_tab_helper ? session_tab_helper->session_id().id() : -1;
@@ -30,7 +31,7 @@ std::unique_ptr<content::NavigationUIData> ChromeNavigationUIData::Clone()
std::unique_ptr<ChromeNavigationUIData> copy =
base::MakeUnique<ChromeNavigationUIData>();
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
if (extension_data_)
copy->SetExtensionNavigationUIData(extension_data_->DeepCopy());
#endif
@@ -38,7 +39,7 @@ std::unique_ptr<content::NavigationUIData> ChromeNavigationUIData::Clone()
return std::move(copy);
}
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
void ChromeNavigationUIData::SetExtensionNavigationUIData(
std::unique_ptr<extensions::ExtensionNavigationUIData> extension_data) {
extension_data_ = std::move(extension_data);
« no previous file with comments | « chrome/browser/renderer_host/chrome_navigation_ui_data.h ('k') | chrome/browser/renderer_host/chrome_render_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698