chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" - 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

(301)

My Issues | Starred Open | Closed | All

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

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

« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/ime_controller_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_shell_delegate.cc

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc

index 46dd8a0266fcd59fd9b0e68550b19bab4bbca7e8..7f5914c9cc9b3bf6eebd9fc14bf302a33a88d0ff 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -10,16 +10,16 @@

#include "ash/accelerators/magnifier_key_scroller.h"

#include "ash/accelerators/spoken_feedback_toggler.h"

-#include "ash/accessibility_delegate.h"

-#include "ash/accessibility_types.h"

+#include "ash/common/accessibility_delegate.h"

+#include "ash/common/accessibility_types.h"

+#include "ash/common/wallpaper/wallpaper_delegate.h"

+#include "ash/common/wm_shell.h"

+#include "ash/common/wm_window.h"

#include "ash/content/gpu_support_impl.h"

#include "ash/shell.h"

-#include "ash/wallpaper/wallpaper_delegate.h"

#include "ash/wm/mru_window_tracker.h"

#include "ash/wm/window_state.h"

#include "ash/wm/window_util.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/command_line.h"

#include "base/macros.h"

#include "base/memory/ptr_util.h"

« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/ime_controller_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698