diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 06:48:57 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 06:48:57 +0000 |
| commit | 787bee8e6daf332f4f7fb2800699185066713d27 (patch) | |
| tree | 8f66444696e283cd8bf90704b0eebe96846c0b25 /apps | |
| parent | abd6c4d1193f47459c819948694d024bb796314f (diff) | |
| download | chromium_src-787bee8e6daf332f4f7fb2800699185066713d27.zip chromium_src-787bee8e6daf332f4f7fb2800699185066713d27.tar.gz chromium_src-787bee8e6daf332f4f7fb2800699185066713d27.tar.bz2 | |
Update frame color API to use unions.
This allows us to use the 'frame' option either as a string (for type)
or as a dictionary (for type and / or color).
Note, this is backwards incompatible with the previous way of setting frame color. To use frame color you now use 'frame' instead of 'frameOptions'.
BUG=339558
Review URL: https://codereview.chromium.org/197813008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_window_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_window_browsertest.cc b/apps/app_window_browsertest.cc index ccb409e..cc41155 100644 --- a/apps/app_window_browsertest.cc +++ b/apps/app_window_browsertest.cc @@ -43,7 +43,7 @@ IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForDefaultFrame) { // See crbug.com/346115 IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForColoredFrame) { AppWindow* app_window = - CreateTestAppWindow("{ \"frameOptions\": { \"color\": \"#ffffff\" } }"); + CreateTestAppWindow("{ \"frame\": { \"color\": \"#ffffff\" } }"); NativeAppWindow* native_window = app_window->GetBaseWindow(); gfx::Insets insets = native_window->GetFrameInsets(); |