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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 2424183002: Remove Chromecast extension support from cast system tray menu. (Closed)
Patch Set: Additional removals Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index 9c41b5aedb3cb081ee36aa783ae3c9fea822e3db..55715cd735f308f2704b4a022506f8d27d3675c2 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -39,6 +39,7 @@
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_discovery_session.h"
#include "extensions/browser/app_window/app_window_registry.h"
+#include "ui/base/ime/chromeos/ime_keyboard.h"
#include "ui/base/ime/chromeos/input_method_manager.h"
#include "ui/chromeos/ime/input_method_menu_manager.h"
@@ -251,15 +252,15 @@ class SystemTrayDelegateChromeOS
std::unique_ptr<content::NotificationRegistrar> registrar_;
std::unique_ptr<PrefChangeRegistrar> local_state_registrar_;
std::unique_ptr<PrefChangeRegistrar> user_pref_registrar_;
- Profile* user_profile_;
- int search_key_mapped_to_;
- bool have_session_start_time_;
+ Profile* user_profile_ = nullptr;
+ int search_key_mapped_to_ = input_method::kSearchKey;
+ bool have_session_start_time_ = false;
base::TimeTicks session_start_time_;
- bool have_session_length_limit_;
+ bool have_session_length_limit_ = false;
base::TimeDelta session_length_limit_;
std::string enterprise_domain_;
- bool should_run_bluetooth_discovery_;
- bool session_started_;
+ bool should_run_bluetooth_discovery_ = false;
+ bool session_started_ = false;
scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
std::unique_ptr<device::BluetoothDiscoverySession>

Powered by Google App Engine
This is Rietveld 408576698