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

Unified Diff: ash/aura/shell_port_classic.h

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Fix WmShelf::ForWindow. Created 3 years, 7 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/app_list/app_list_presenter_delegate_unittest.cc ('k') | ash/aura/shell_port_classic.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/shell_port_classic.h
diff --git a/ash/aura/shell_port_classic.h b/ash/aura/shell_port_classic.h
index ba4eebe1a200f424cc03abbf27178c951b178a99..5d8c3f36fee057c80b706728d06bf84acba62688 100644
--- a/ash/aura/shell_port_classic.h
+++ b/ash/aura/shell_port_classic.h
@@ -35,8 +35,8 @@ class ASH_EXPORT ShellPortClassic : public ShellPort,
// ShellPort:
void Shutdown() override;
Config GetAshConfig() const override;
- WmWindow* GetPrimaryRootWindow() override;
- WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
+ aura::Window* GetPrimaryRootWindow() override;
+ aura::Window* GetRootWindowForDisplayId(int64_t display_id) override;
const display::ManagedDisplayInfo& GetDisplayInfo(
int64_t display_id) const override;
bool IsActiveDisplayId(int64_t display_id) const override;
« no previous file with comments | « ash/app_list/app_list_presenter_delegate_unittest.cc ('k') | ash/aura/shell_port_classic.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698