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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 2078393005: mash: Move accessibility_types.h from ui namespace to ash namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a11y
Patch Set: fix chromevox code generated from js Created 4 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/common/accessibility_types.h"
13 #include "ash/common/session/session_state_observer.h" 14 #include "ash/common/session/session_state_observer.h"
14 #include "ash/common/system/tray/system_tray_delegate.h" 15 #include "ash/common/system/tray/system_tray_delegate.h"
15 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h" 16 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
16 #include "ash/system/tray/system_tray.h" 17 #include "ash/system/tray/system_tray.h"
17 #include "ash/system/tray/system_tray_notifier.h" 18 #include "ash/system/tray/system_tray_notifier.h"
18 #include "base/callback_forward.h" 19 #include "base/callback_forward.h"
19 #include "base/callback_list.h" 20 #include "base/callback_list.h"
20 #include "base/compiler_specific.h" 21 #include "base/compiler_specific.h"
21 #include "base/macros.h" 22 #include "base/macros.h"
22 #include "base/memory/ref_counted.h" 23 #include "base/memory/ref_counted.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 gfx::NativeWindow GetNativeWindow() const; 203 gfx::NativeWindow GetNativeWindow() const;
203 204
204 // content::NotificationObserver implementation. 205 // content::NotificationObserver implementation.
205 void Observe(int type, 206 void Observe(int type,
206 const content::NotificationSource& source, 207 const content::NotificationSource& source,
207 const content::NotificationDetails& details) override; 208 const content::NotificationDetails& details) override;
208 209
209 void OnLanguageRemapSearchKeyToChanged(); 210 void OnLanguageRemapSearchKeyToChanged();
210 211
211 void OnAccessibilityModeChanged( 212 void OnAccessibilityModeChanged(
212 ui::AccessibilityNotificationVisibility notify); 213 ash::AccessibilityNotificationVisibility notify);
213 214
214 void UpdatePerformanceTracing(); 215 void UpdatePerformanceTracing();
215 216
216 // Overridden from InputMethodManager::Observer. 217 // Overridden from InputMethodManager::Observer.
217 void InputMethodChanged(input_method::InputMethodManager* manager, 218 void InputMethodChanged(input_method::InputMethodManager* manager,
218 Profile* profile, 219 Profile* profile,
219 bool show_message) override; 220 bool show_message) override;
220 221
221 // Overridden from InputMethodMenuManager::Observer. 222 // Overridden from InputMethodMenuManager::Observer.
222 void InputMethodMenuItemChanged( 223 void InputMethodMenuItemChanged(
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 318
318 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 319 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
319 320
320 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 321 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
321 }; 322 };
322 323
323 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 324 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
324 325
325 } // namespace chromeos 326 } // namespace chromeos
326 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 327 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698