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

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

Issue 2933923002: Remove update icon after user confirms download (Closed)
Patch Set: Apply fix to patch set 2 Created 3 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 <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "ash/accessibility_types.h" 14 #include "ash/accessibility_types.h"
15 #include "ash/system/tray/ime_info.h" 15 #include "ash/system/tray/ime_info.h"
16 #include "ash/system/tray/system_tray_delegate.h" 16 #include "ash/system/tray/system_tray_delegate.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/observer_list.h" 18 #include "base/observer_list.h"
19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ui/browser_list_observer.h" 21 #include "chrome/browser/ui/browser_list_observer.h"
22 #include "chromeos/dbus/update_engine_client.h"
22 #include "components/prefs/pref_change_registrar.h" 23 #include "components/prefs/pref_change_registrar.h"
23 #include "content/public/browser/notification_observer.h" 24 #include "content/public/browser/notification_observer.h"
24 #include "content/public/browser/notification_registrar.h" 25 #include "content/public/browser/notification_registrar.h"
25 #include "extensions/browser/app_window/app_window_registry.h" 26 #include "extensions/browser/app_window/app_window_registry.h"
26 #include "ui/base/ime/chromeos/ime_keyboard.h" 27 #include "ui/base/ime/chromeos/ime_keyboard.h"
27 #include "ui/base/ime/chromeos/input_method_manager.h" 28 #include "ui/base/ime/chromeos/input_method_manager.h"
28 #include "ui/chromeos/ime/input_method_menu_manager.h" 29 #include "ui/chromeos/ime/input_method_menu_manager.h"
29 30
30 namespace ash { 31 namespace ash {
31 class SystemTrayNotifier; 32 class SystemTrayNotifier;
32 } 33 }
33 34
34 namespace chromeos { 35 namespace chromeos {
35 36
36 class SystemTrayDelegateChromeOS 37 class SystemTrayDelegateChromeOS
37 : public ui::ime::InputMethodMenuManager::Observer, 38 : public ui::ime::InputMethodMenuManager::Observer,
38 public ash::SystemTrayDelegate, 39 public ash::SystemTrayDelegate,
39 public content::NotificationObserver, 40 public content::NotificationObserver,
40 public input_method::InputMethodManager::Observer, 41 public input_method::InputMethodManager::Observer,
41 public chrome::BrowserListObserver, 42 public chrome::BrowserListObserver,
42 public extensions::AppWindowRegistry::Observer, 43 public extensions::AppWindowRegistry::Observer,
43 public input_method::InputMethodManager::ImeMenuObserver { 44 public input_method::InputMethodManager::ImeMenuObserver,
45 public UpdateEngineClient::Observer {
44 public: 46 public:
45 SystemTrayDelegateChromeOS(); 47 SystemTrayDelegateChromeOS();
46 ~SystemTrayDelegateChromeOS() override; 48 ~SystemTrayDelegateChromeOS() override;
47 49
48 // Overridden from ash::SystemTrayDelegate: 50 // Overridden from ash::SystemTrayDelegate:
49 void Initialize() override; 51 void Initialize() override;
50 void ShowUserLogin() override; 52 void ShowUserLogin() override;
51 void GetCurrentIME(ash::IMEInfo* info) override; 53 void GetCurrentIME(ash::IMEInfo* info) override;
52 void GetAvailableIMEList(ash::IMEInfoList* list) override; 54 void GetAvailableIMEList(ash::IMEInfoList* list) override;
53 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override; 55 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 const AccessibilityStatusEventDetails& details); 110 const AccessibilityStatusEventDetails& details);
109 111
110 // input_method::InputMethodManager::ImeMenuObserver: 112 // input_method::InputMethodManager::ImeMenuObserver:
111 void ImeMenuActivationChanged(bool is_active) override; 113 void ImeMenuActivationChanged(bool is_active) override;
112 void ImeMenuListChanged() override; 114 void ImeMenuListChanged() override;
113 void ImeMenuItemsChanged( 115 void ImeMenuItemsChanged(
114 const std::string& engine_id, 116 const std::string& engine_id,
115 const std::vector<input_method::InputMethodManager::MenuItem>& items) 117 const std::vector<input_method::InputMethodManager::MenuItem>& items)
116 override; 118 override;
117 119
120 // Overridden from UpdateEngineClient::Observer.
121 void OnUpdateOverCellularTargetSet(bool success) override;
122
118 std::unique_ptr<content::NotificationRegistrar> registrar_; 123 std::unique_ptr<content::NotificationRegistrar> registrar_;
119 std::unique_ptr<PrefChangeRegistrar> user_pref_registrar_; 124 std::unique_ptr<PrefChangeRegistrar> user_pref_registrar_;
120 Profile* user_profile_ = nullptr; 125 Profile* user_profile_ = nullptr;
121 int search_key_mapped_to_ = input_method::kSearchKey; 126 int search_key_mapped_to_ = input_method::kSearchKey;
122 127
123 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; 128 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
124 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 129 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
125 130
126 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 131 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
127 }; 132 };
128 133
129 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 134 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
130 135
131 } // namespace chromeos 136 } // namespace chromeos
132 137
133 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 138 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/system/update/update_observer.h ('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