summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorskuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-04 04:39:39 +0000
committerskuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-04 04:39:39 +0000
commit9f9bb4144867f679e6682833d17e4e112e3abc9c (patch)
treedc28dd777d32c9326311b673728234e111bceb16 /ui
parent79a3233afcaadb7cca24a0494b0ec8eebbd245bf (diff)
downloadchromium_src-9f9bb4144867f679e6682833d17e4e112e3abc9c.zip
chromium_src-9f9bb4144867f679e6682833d17e4e112e3abc9c.tar.gz
chromium_src-9f9bb4144867f679e6682833d17e4e112e3abc9c.tar.bz2
Adding new maximize menu according to specification.
BUG=132686 TEST=Visually tested Review URL: https://chromiumcodereview.appspot.com/10823025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/resources/default_100_percent/aura/window_fullscreen_close_hover.pngbin1544 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_fullscreen_close_normal.pngbin1519 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_fullscreen_close_pressed.pngbin1644 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_fullscreen_restore_hover.pngbin913 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_fullscreen_restore_normal.pngbin644 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_fullscreen_restore_pressed.pngbin889 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_fullscreen_separator.pngbin1008 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_close_hover.pngbin1544 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_close_normal.pngbin1519 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_close_pressed.pngbin1644 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_minimize_hover.pngbin1426 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_minimize_normal.pngbin1394 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_minimize_pressed.pngbin1637 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_restore_hover.pngbin1777 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_restore_normal.pngbin1492 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_restore_pressed.pngbin1773 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_snap_left_pressed.pngbin1783 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_snap_minimize_pressed.pngbin1740 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_snap_pressed.pngbin1773 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_maximized_snap_right_pressed.pngbin1786 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_snap_left_pressed.pngbin1886 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_snap_minimize_pressed.pngbin1849 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_snap_pressed.pngbin1868 -> 0 bytes
-rw-r--r--ui/resources/default_100_percent/aura/window_snap_right_pressed.pngbin1884 -> 0 bytes
-rw-r--r--ui/resources/ui_resources.grd80
-rw-r--r--ui/views/bubble/bubble_delegate.cc4
-rw-r--r--ui/views/bubble/bubble_delegate.h9
27 files changed, 52 insertions, 41 deletions
diff --git a/ui/resources/default_100_percent/aura/window_fullscreen_close_hover.png b/ui/resources/default_100_percent/aura/window_fullscreen_close_hover.png
deleted file mode 100644
index e7fcb89..0000000
--- a/ui/resources/default_100_percent/aura/window_fullscreen_close_hover.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_fullscreen_close_normal.png b/ui/resources/default_100_percent/aura/window_fullscreen_close_normal.png
deleted file mode 100644
index f9fd68b..0000000
--- a/ui/resources/default_100_percent/aura/window_fullscreen_close_normal.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_fullscreen_close_pressed.png b/ui/resources/default_100_percent/aura/window_fullscreen_close_pressed.png
deleted file mode 100644
index 17b7eed..0000000
--- a/ui/resources/default_100_percent/aura/window_fullscreen_close_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_fullscreen_restore_hover.png b/ui/resources/default_100_percent/aura/window_fullscreen_restore_hover.png
deleted file mode 100644
index fad54a0..0000000
--- a/ui/resources/default_100_percent/aura/window_fullscreen_restore_hover.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_fullscreen_restore_normal.png b/ui/resources/default_100_percent/aura/window_fullscreen_restore_normal.png
deleted file mode 100644
index ba5e52e..0000000
--- a/ui/resources/default_100_percent/aura/window_fullscreen_restore_normal.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_fullscreen_restore_pressed.png b/ui/resources/default_100_percent/aura/window_fullscreen_restore_pressed.png
deleted file mode 100644
index e1e7943..0000000
--- a/ui/resources/default_100_percent/aura/window_fullscreen_restore_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_fullscreen_separator.png b/ui/resources/default_100_percent/aura/window_fullscreen_separator.png
deleted file mode 100644
index ecc5199..0000000
--- a/ui/resources/default_100_percent/aura/window_fullscreen_separator.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_close_hover.png b/ui/resources/default_100_percent/aura/window_maximized_close_hover.png
deleted file mode 100644
index dd8911f..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_close_hover.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_close_normal.png b/ui/resources/default_100_percent/aura/window_maximized_close_normal.png
deleted file mode 100644
index a487531..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_close_normal.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_close_pressed.png b/ui/resources/default_100_percent/aura/window_maximized_close_pressed.png
deleted file mode 100644
index ffdb40b0..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_close_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_minimize_hover.png b/ui/resources/default_100_percent/aura/window_maximized_minimize_hover.png
deleted file mode 100644
index 32b17b3..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_minimize_hover.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_minimize_normal.png b/ui/resources/default_100_percent/aura/window_maximized_minimize_normal.png
deleted file mode 100644
index b604183..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_minimize_normal.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_minimize_pressed.png b/ui/resources/default_100_percent/aura/window_maximized_minimize_pressed.png
deleted file mode 100644
index 7e7fc5e..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_minimize_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_restore_hover.png b/ui/resources/default_100_percent/aura/window_maximized_restore_hover.png
deleted file mode 100644
index 8f01fd8..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_restore_hover.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_restore_normal.png b/ui/resources/default_100_percent/aura/window_maximized_restore_normal.png
deleted file mode 100644
index 1badf7b..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_restore_normal.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_restore_pressed.png b/ui/resources/default_100_percent/aura/window_maximized_restore_pressed.png
deleted file mode 100644
index 039ae7a..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_restore_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_snap_left_pressed.png b/ui/resources/default_100_percent/aura/window_maximized_snap_left_pressed.png
deleted file mode 100644
index 5fbb3c1..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_snap_left_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_snap_minimize_pressed.png b/ui/resources/default_100_percent/aura/window_maximized_snap_minimize_pressed.png
deleted file mode 100644
index 8d44eec..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_snap_minimize_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_snap_pressed.png b/ui/resources/default_100_percent/aura/window_maximized_snap_pressed.png
deleted file mode 100644
index 039ae7a..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_snap_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_maximized_snap_right_pressed.png b/ui/resources/default_100_percent/aura/window_maximized_snap_right_pressed.png
deleted file mode 100644
index 5a32110..0000000
--- a/ui/resources/default_100_percent/aura/window_maximized_snap_right_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_snap_left_pressed.png b/ui/resources/default_100_percent/aura/window_snap_left_pressed.png
deleted file mode 100644
index c8640bb..0000000
--- a/ui/resources/default_100_percent/aura/window_snap_left_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_snap_minimize_pressed.png b/ui/resources/default_100_percent/aura/window_snap_minimize_pressed.png
deleted file mode 100644
index 5cabbdb..0000000
--- a/ui/resources/default_100_percent/aura/window_snap_minimize_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_snap_pressed.png b/ui/resources/default_100_percent/aura/window_snap_pressed.png
deleted file mode 100644
index 4eb4fe9..0000000
--- a/ui/resources/default_100_percent/aura/window_snap_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/default_100_percent/aura/window_snap_right_pressed.png b/ui/resources/default_100_percent/aura/window_snap_right_pressed.png
deleted file mode 100644
index 79dc489..0000000
--- a/ui/resources/default_100_percent/aura/window_snap_right_pressed.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index d94da3f..14993df 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -159,20 +159,15 @@
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="ash/status_wifi_enabled_h.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFY_CLOSE" file="ash/status_notify_x.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="aura/window_button_separator.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hover.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed.png" />
<!-- TODO(benrg): Get rid of all conditionals that test the output
context. -->
<if expr="context.startswith('default_')">
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_fullscreen_close_normal.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="aura/window_fullscreen_close_hover.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="aura/window_fullscreen_close_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_fullscreen_restore_normal.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_fullscreen_restore_hover.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_fullscreen_restore_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_fullscreen_separator.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="cros/window_close_fullscreen_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="cros/window_close_fullscreen_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="cros/window_close_fullscreen_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="cros/window_size_fullscreen_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="cros/window_size_fullscreen_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="cros/window_size_fullscreen_pressed.png" />
</if>
<if expr="not context.startswith('default_')">
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_close_normal.png" />
@@ -181,7 +176,6 @@
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_restore_normal.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_restore_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_restore_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_button_separator.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_SHADOW" file="aura/window_fullscreen_shadow.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_ACTIVE" file="aura/window_header_base_active.png" />
@@ -198,45 +192,51 @@
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP" file="aura/window_header_shade_top.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT" file="aura/window_header_shade_top_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT" file="aura/window_header_shade_top_right.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE" file="aura/window_maximize_normal.png" />
+
<if expr="context.startswith('default_')">
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_maximized_close_normal.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_maximized_close_hover.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_maximized_close_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file="cros/window_close_tall_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" file="cros/window_close_tall_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_P" file="cros/window_close_tall_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="cros/window_close_short_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="cros/window_close_short_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="cros/window_close_short_pressed.png" />
+
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE" file="cros/window_size_tall_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_H" file="cros/window_size_tall_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_P" file="cros/window_size_tall_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="cros/window_size_short_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="cros/window_size_short_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="cros/window_size_short_pressed.png" />
</if>
<if expr="not context.startswith('default_')">
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_close_normal.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_close_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_close_pressed.png" />
- </if>
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="aura/window_maximized_minimize_normal.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="aura/window_maximized_minimize_hover.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="aura/window_maximized_minimize_pressed.png" />
- <if expr="context.startswith('default_')">
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_maximized_restore_normal.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_maximized_restore_hover.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_maximized_restore_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="aura/window_maximized_snap_left_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="aura/window_maximized_snap_minimize_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="aura/window_maximized_snap_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="aura/window_maximized_snap_right_pressed.png" />
- </if>
- <if expr="not context.startswith('default_')">
+
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE" file="aura/window_maximize_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_H" file="aura/window_maximize_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_P" file="aura/window_maximize_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_restore_normal.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_restore_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_restore_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="aura/window_snap_left_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="aura/window_snap_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="aura/window_snap_right_pressed.png" />
</if>
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_H" file="aura/window_maximize_hover.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_P" file="aura/window_maximize_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="aura/window_snap_left_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_SNAP_P" file="aura/window_snap_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="aura/window_snap_right_pressed.png" />
+
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT" file="cros/window_position_left_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_H" file="cros/window_position_left_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_LEFT_P" file="cros/window_position_left_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_MIDDLE" file="cros/window_position_middle_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_MIDDLE_H" file="cros/window_position_middle_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_MIDDLE_P" file="cros/window_position_middle_pressed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT" file="cros/window_position_right_normal.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_H" file="cros/window_position_right_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_POSITION_RIGHT_P" file="cros/window_position_right_pressed.png" />
+
+ <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_ZOOM_ICON" file="aura/slab_zoom.png" />
+
</if>
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_BADGE_CENTER" file="browser_action_badge_center.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_BADGE_LEFT" file="browser_action_badge_left.png" />
diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index 0fc6fad..7f64fd3 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -115,6 +115,7 @@ BubbleDelegateView::BubbleDelegateView()
original_opacity_(255),
border_widget_(NULL),
use_focusless_(false),
+ try_mirroring_arrow_(true),
parent_window_(NULL) {
set_background(Background::CreateSolidBackground(color_));
AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
@@ -134,6 +135,7 @@ BubbleDelegateView::BubbleDelegateView(
original_opacity_(255),
border_widget_(NULL),
use_focusless_(false),
+ try_mirroring_arrow_(true),
parent_window_(NULL) {
set_background(Background::CreateSolidBackground(color_));
AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
@@ -336,7 +338,7 @@ gfx::Rect BubbleDelegateView::GetBubbleBounds() {
// The argument rect has its origin at the bubble's arrow anchor point;
// its size is the preferred size of the bubble's client view (this view).
return GetBubbleFrameView()->GetUpdatedWindowBounds(GetAnchorRect(),
- GetPreferredSize(), true /*try_mirroring_arrow*/);
+ GetPreferredSize(), try_mirroring_arrow_);
}
#if defined(OS_WIN) && !defined(USE_AURA)
diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h
index cb9ba9f..1963fad 100644
--- a/ui/views/bubble/bubble_delegate.h
+++ b/ui/views/bubble/bubble_delegate.h
@@ -83,6 +83,11 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
use_focusless_ = use_focusless;
}
+ bool try_mirroring_arrow() const { return try_mirroring_arrow_; }
+ void set_try_mirroring_arrow(bool try_mirroring_arrow) {
+ try_mirroring_arrow_ = try_mirroring_arrow;
+ }
+
// Get the arrow's anchor rect in screen space.
virtual gfx::Rect GetAnchorRect();
@@ -173,6 +178,10 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
// These bubbles are not interactive and should not gain focus.
bool use_focusless_;
+ // If true (defaults to true), the arrow may be mirrored to fit the
+ // bubble on screen better.
+ bool try_mirroring_arrow_;
+
// Parent native window of the bubble.
gfx::NativeView parent_window_;