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

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: cleanup 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 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/ash_constants.h" 13 #include "ash/ash_constants.h"
14 #include "ash/autoclick/autoclick_controller.h" 14 #include "ash/autoclick/autoclick_controller.h"
15 #include "ash/autoclick/mus/public/interfaces/autoclick.mojom.h" 15 #include "ash/autoclick/mus/public/interfaces/autoclick.mojom.h"
16 #include "ash/high_contrast/high_contrast_controller.h" 16 #include "ash/high_contrast/high_contrast_controller.h"
17 #include "ash/root_window_controller.h" 17 #include "ash/root_window_controller.h"
18 #include "ash/shelf/shelf.h"
18 #include "ash/shelf/shelf_layout_manager.h" 19 #include "ash/shelf/shelf_layout_manager.h"
19 #include "ash/shelf/wm_shelf.h"
20 #include "ash/shell.h" 20 #include "ash/shell.h"
21 #include "ash/shell_port.h" 21 #include "ash/shell_port.h"
22 #include "ash/sticky_keys/sticky_keys_controller.h" 22 #include "ash/sticky_keys/sticky_keys_controller.h"
23 #include "ash/wm_window.h" 23 #include "ash/wm_window.h"
24 #include "base/callback.h" 24 #include "base/callback.h"
25 #include "base/callback_helpers.h" 25 #include "base/callback_helpers.h"
26 #include "base/command_line.h" 26 #include "base/command_line.h"
27 #include "base/macros.h" 27 #include "base/macros.h"
28 #include "base/memory/ptr_util.h" 28 #include "base/memory/ptr_util.h"
29 #include "base/memory/singleton.h" 29 #include "base/memory/singleton.h"
(...skipping 1497 matching lines...) Expand 10 before | Expand all | Expand 10 after
1527 content::BrowserContext* context) { 1527 content::BrowserContext* context) {
1528 keyboard_listener_extension_id_ = id; 1528 keyboard_listener_extension_id_ = id;
1529 1529
1530 extensions::ExtensionRegistry* registry = 1530 extensions::ExtensionRegistry* registry =
1531 extensions::ExtensionRegistry::Get(context); 1531 extensions::ExtensionRegistry::Get(context);
1532 if (!extension_registry_observer_.IsObserving(registry) && !id.empty()) 1532 if (!extension_registry_observer_.IsObserving(registry) && !id.empty())
1533 extension_registry_observer_.Add(registry); 1533 extension_registry_observer_.Add(registry);
1534 } 1534 }
1535 1535
1536 } // namespace chromeos 1536 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698