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

Unified Diff: ash/common/devtools/ash_devtools_dom_agent.h

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 months 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
« no previous file with comments | « ash/common/accelerators/debug_commands.cc ('k') | ash/common/devtools/ash_devtools_dom_agent.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/devtools/ash_devtools_dom_agent.h
diff --git a/ash/common/devtools/ash_devtools_dom_agent.h b/ash/common/devtools/ash_devtools_dom_agent.h
index c66a04f2734ae8b84cdb362611b6768a7757b1b9..97990430c5b8c922b2d037f183a89da3a4af30a2 100644
--- a/ash/common/devtools/ash_devtools_dom_agent.h
+++ b/ash/common/devtools/ash_devtools_dom_agent.h
@@ -5,8 +5,8 @@
#ifndef ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
#define ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
-#include "ash/common/wm_shell.h"
-#include "base/compiler_specific.h"
+#include "ash/ash_export.h"
+#include "base/macros.h"
#include "base/observer_list.h"
#include "components/ui_devtools/DOM.h"
#include "components/ui_devtools/devtools_base_agent.h"
@@ -18,6 +18,9 @@
#include "ui/views/widget/widget_removals_observer.h"
namespace ash {
+
+class WmWindow;
+
namespace devtools {
class ASH_EXPORT AshDevToolsDOMAgentObserver {
@@ -35,7 +38,7 @@ class ASH_EXPORT AshDevToolsDOMAgent
public views::WidgetRemovalsObserver,
public views::ViewObserver {
public:
- AshDevToolsDOMAgent(ash::WmShell* shell);
+ AshDevToolsDOMAgent();
~AshDevToolsDOMAgent() override;
// DOM::Backend
@@ -127,7 +130,6 @@ class ASH_EXPORT AshDevToolsDOMAgent
bool IsHighlightingWindow(WmWindow* window);
std::unique_ptr<views::Widget> widget_for_highlighting_;
- ash::WmShell* shell_;
using WindowToNodeIdMap = std::unordered_map<WmWindow*, int>;
WindowToNodeIdMap window_to_node_id_map_;
« no previous file with comments | « ash/common/accelerators/debug_commands.cc ('k') | ash/common/devtools/ash_devtools_dom_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698