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

Side by Side Diff: chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase. Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <utility> 11 #include <utility>
12 12
13 #include "ash/aura/wm_window_aura.h" 13 #include "ash/aura/wm_window_aura.h"
14 #include "ash/autoclick/autoclick_controller.h" 14 #include "ash/autoclick/autoclick_controller.h"
15 #include "ash/common/session/session_state_delegate.h" 15 #include "ash/common/session/session_state_delegate.h"
16 #include "ash/common/shelf/shelf.h"
17 #include "ash/common/shelf/shelf_layout_manager.h"
16 #include "ash/common/wm_shell.h" 18 #include "ash/common/wm_shell.h"
17 #include "ash/high_contrast/high_contrast_controller.h" 19 #include "ash/high_contrast/high_contrast_controller.h"
18 #include "ash/root_window_controller.h" 20 #include "ash/root_window_controller.h"
19 #include "ash/shelf/shelf.h"
20 #include "ash/shelf/shelf_layout_manager.h"
21 #include "ash/shell.h" 21 #include "ash/shell.h"
22 #include "ash/sticky_keys/sticky_keys_controller.h" 22 #include "ash/sticky_keys/sticky_keys_controller.h"
23 #include "base/callback.h" 23 #include "base/callback.h"
24 #include "base/callback_helpers.h" 24 #include "base/callback_helpers.h"
25 #include "base/command_line.h" 25 #include "base/command_line.h"
26 #include "base/macros.h" 26 #include "base/macros.h"
27 #include "base/memory/singleton.h" 27 #include "base/memory/singleton.h"
28 #include "base/metrics/histogram.h" 28 #include "base/metrics/histogram.h"
29 #include "base/path_service.h" 29 #include "base/path_service.h"
30 #include "base/strings/string_split.h" 30 #include "base/strings/string_split.h"
(...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 content::BrowserContext* context) { 1543 content::BrowserContext* context) {
1544 keyboard_listener_extension_id_ = id; 1544 keyboard_listener_extension_id_ = id;
1545 1545
1546 extensions::ExtensionRegistry* registry = 1546 extensions::ExtensionRegistry* registry =
1547 extensions::ExtensionRegistry::Get(context); 1547 extensions::ExtensionRegistry::Get(context);
1548 if (!extension_registry_observer_.IsObserving(registry) && !id.empty()) 1548 if (!extension_registry_observer_.IsObserving(registry) && !id.empty())
1549 extension_registry_observer_.Add(registry); 1549 extension_registry_observer_.Add(registry);
1550 } 1550 }
1551 1551
1552 } // namespace chromeos 1552 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/workspace_controller_unittest.cc ('k') | chrome/browser/chromeos/accessibility/chromevox_panel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698