summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-25 18:20:20 +0000
committerkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-25 18:20:20 +0000
commit319b97594b6353fb01be8f4470cde57275c77340 (patch)
treea5e726e09efb6a67a090530592d2447d7e102e9b /ash
parentbdaf88d35fbf4dbc4008a1b47f48ae17971e1a54 (diff)
downloadchromium_src-319b97594b6353fb01be8f4470cde57275c77340.zip
chromium_src-319b97594b6353fb01be8f4470cde57275c77340.tar.gz
chromium_src-319b97594b6353fb01be8f4470cde57275c77340.tar.bz2
Bluetooth: do not change tray menu to say Disconnecting
Clicking on a Bluetooth item in the tray no longer disconnects, so don't show a Disconnecting... message that will never be fulfilled. BUG=175640 TEST=-Dchromeos=1 on Ubuntu, chrome --enable-experimental-bluetooth, connect to the Fake Device and then click on it again R=jennyz@chromium.org Review URL: https://chromiumcodereview.appspot.com/14420003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/ash_strings.grd17
-rw-r--r--ash/system/bluetooth/tray_bluetooth.cc8
2 files changed, 9 insertions, 16 deletions
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
index 0dbb598..96d80af 100644
--- a/ash/ash_strings.grd
+++ b/ash/ash_strings.grd
@@ -258,9 +258,6 @@ Press Ctrl+Alt+Z to disable.
<message name="IDS_ASH_STATUS_TRAY_BLUETOOTH_CONNECTING" desc="Shows a connecting bluetooth device in the bluetooth list.">
<ph name="BLUETOOTH">$1<ex>Apple Magic Mouse</ex></ph>: Connecting...
</message>
- <message name="IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCONNECTING" desc="Shows a disconnecting bluetooth device in the bluetooth list.">
- <ph name="BLUETOOTH">$1<ex>Apple Magic Mouse</ex></ph>: Disconnecting...
- </message>
<message name="IDS_ASH_STATUS_TRAY_DISABLE_BLUETOOTH" desc="The label used in the tray popup to disable bluetooth.">
Disable Bluetooth
</message>
@@ -289,10 +286,10 @@ Press Ctrl+Alt+Z to disable.
</message>
<message name="IDS_ASH_STATUS_TRAY_AUDIO_OUTPUT" desc="The label used in audio detailed page for audio output section of ash tray pop up.">
OUTPUT
- </message>
+ </message>
<message name="IDS_ASH_STATUS_TRAY_AUDIO_INPUT" desc="The label used in audio detailed page for audio input section of ash tray pop up.">
INPUT
- </message>
+ </message>
<message name="IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING" desc="The label used in the tray to show that the current status is mirroring.">
Mirroring to <ph name="DISPLAY_NAME">$1</ph>
@@ -366,7 +363,7 @@ Press Shift + Alt to switch.
<message name="IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE" desc="The label used in the title of the accessibility option menu.">
Accessibility
</message>
- <message name="IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SPOKEN_FEEDBACK" desc="The label used in the accessibility menu of the
+ <message name="IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SPOKEN_FEEDBACK" desc="The label used in the accessibility menu of the
system tray to toggle on/off spoken feedback feature.">
Spoken feedback
</message>
@@ -397,10 +394,10 @@ Press Shift + Alt to switch.
</message>
<message name="IDS_ASH_STATUS_TRAY_BATTERY_TIME_LEFT_SHORT" desc="The label in the tray bubble settings row to show a time estimate until the battery is empty.">
<ph name="hour">$1<ex>2</ex></ph>:<ph name="minute">$2<ex>53</ex></ph> left
- </message>
+ </message>
<message name="IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL_SHORT" desc="The label in the tray bubble settings row to show a time estimate until the battery is fully charged.">
<ph name="hour">$1<ex>2</ex></ph>:<ph name="minute">$2<ex>53</ex></ph> until full
- </message>
+ </message>
<message name="IDS_ASH_STATUS_TRAY_BATTERY_FULL_CHARGE_ACCESSIBLE" desc="The message used by accessibility to show battery is full and charging.">
Battery is full and charging.
</message>
@@ -409,10 +406,10 @@ Press Shift + Alt to switch.
</message>
<message name="IDS_ASH_STATUS_TRAY_BATTERY_PERCENT_CHARGING_ACCESSIBLE" desc="The message used by accessibility to show battery is calculating its time.">
Battery is <ph name="percentage">$1<ex>56</ex></ph>% full and charging
- </message>
+ </message>
<message name="IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING_ACCESSIBLE" desc="The message used by accessibility to show battery is calculating its time in short message.">
Calculating battery time.
- </message>
+ </message>
<message name= "IDS_ASH_STATUS_TRAY_BATTERY_TIME_LEFT_ACCESSIBLE" desc="The message used by accessibility to read remaining battery time until empty.">
Time left until battery is empty, <ph name="time_left">$1<ex>1 hour and 15 minutes</ex></ph>
</message>
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc
index fd9099e..2b7eb56 100644
--- a/ash/system/bluetooth/tray_bluetooth.cc
+++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -291,15 +291,11 @@ class BluetoothDetailedView : public TrayDetailsView,
// or disconnected if such an operation is going to be performed underway.
void UpdateClickedDevice(std::string device_id, views::View* item_container) {
base::string16 display_name;
- if (FoundDevice(device_id, connected_devices_, &display_name)) {
- display_name = l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCONNECTING, display_name);
- } else if (FoundDevice(device_id, paired_not_connected_devices_,
+ if (FoundDevice(device_id, paired_not_connected_devices_,
&display_name)) {
display_name = l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_BLUETOOTH_CONNECTING, display_name);
- }
- if (display_name.length() > 0) {
+
item_container->RemoveAllChildViews(true);
static_cast<HoverHighlightView*>(item_container)->
AddCheckableLabel(display_name, gfx::Font::BOLD, false);