ash/shell.h - Issue 2860553002: Clean up most of the ChromeOS headers in non-ChromeOS build - Code Review

Chromium Code Reviews

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

(575)

My Issues | Starred Open | Closed | All

Unified Diff: ash/shell.h

Issue 2860553002: Clean up most of the ChromeOS headers in non-ChromeOS build (Closed)

Patch Set: rebase 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

« no previous file with comments | « no previous file | chrome/browser/certificate_manager_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/shell.h

diff --git a/ash/shell.h b/ash/shell.h

index 53363dbddbf9fcc46a844e02219b675e066b8e07..e3991f2b5652814d4b4b2ed29bc143b5cf53b18d 100644

--- a/ash/shell.h

+++ b/ash/shell.h

@@ -13,7 +13,6 @@

#include "ash/metrics/user_metrics_recorder.h"

#include "ash/public/cpp/shelf_types.h"

#include "ash/session/session_observer.h"

-#include "ash/wm/cursor_manager_chromeos.h"

#include "ash/wm/system_modal_container_event_filter_delegate.h"

#include "base/gtest_prod_util.h"

#include "base/macros.h"

@@ -25,6 +24,10 @@

#include "ui/wm/core/cursor_manager.h"

#include "ui/wm/public/activation_change_observer.h"

+#if defined(OS_CHROMEOS)

+#include "ash/wm/cursor_manager_chromeos.h"

+#endif // defined(OS_CHROMEOS)

+

class PrefRegistrySimple;

class PrefService;

« no previous file with comments | « no previous file | chrome/browser/certificate_manager_model.cc » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698