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

Side by Side Diff: chrome/browser/extensions/global_shortcut_listener_chromeos.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 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/extensions/global_shortcut_listener_chromeos.h" 5 #include "chrome/browser/extensions/global_shortcut_listener_chromeos.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/wm_shell.h" 8 #include "ash/common/wm_shell.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 10
11 using content::BrowserThread; 11 using content::BrowserThread;
12 12
13 namespace extensions { 13 namespace extensions {
14 14
15 // static 15 // static
16 GlobalShortcutListener* GlobalShortcutListener::GetInstance() { 16 GlobalShortcutListener* GlobalShortcutListener::GetInstance() {
17 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 17 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
18 static GlobalShortcutListenerChromeOS* instance = 18 static GlobalShortcutListenerChromeOS* instance =
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 } 73 }
74 return restriction == ash::AcceleratorController:: 74 return restriction == ash::AcceleratorController::
75 RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION; 75 RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
76 } 76 }
77 77
78 bool GlobalShortcutListenerChromeOS::CanHandleAccelerators() const { 78 bool GlobalShortcutListenerChromeOS::CanHandleAccelerators() const {
79 return is_listening_; 79 return is_listening_;
80 } 80 }
81 81
82 } // namespace extensions 82 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/display_info_provider_chromeos_unittest.cc ('k') | chrome/browser/memory/tab_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698