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

Side by Side Diff: extensions/browser/app_window/app_window_interactive_uitest.cc

Issue 1914993002: Enhance chrome.app.window API with better shelf integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + Fixes v10 Created 4 years, 5 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
« no previous file with comments | « extensions/browser/app_window/app_window.cc ('k') | extensions/common/api/app_window.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "build/build_config.h" 5 #include "build/build_config.h"
6 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.h"
7 #include "extensions/browser/app_window/native_app_window.h" 7 #include "extensions/browser/app_window/native_app_window.h"
8 8
9 namespace extensions { 9 namespace extensions {
10 10
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 window->SetAlwaysOnTop(false); 179 window->SetAlwaysOnTop(false);
180 EXPECT_FALSE(window->GetBaseWindow()->IsAlwaysOnTop()); 180 EXPECT_FALSE(window->GetBaseWindow()->IsAlwaysOnTop());
181 181
182 // Ensure that always-on-top remains disabled. 182 // Ensure that always-on-top remains disabled.
183 window->Restore(); 183 window->Restore();
184 EXPECT_FALSE(window->GetBaseWindow()->IsAlwaysOnTop()); 184 EXPECT_FALSE(window->GetBaseWindow()->IsAlwaysOnTop());
185 185
186 CloseAppWindow(window); 186 CloseAppWindow(window);
187 } 187 }
188 188
189 // Tests a window created with showInShelf property enabled is indeed marked
190 // as shown in shelf in AppWindow.
191 IN_PROC_BROWSER_TEST_F(AppWindowTest, InitShowInShelf) {
192 AppWindow* window =
193 CreateTestAppWindow("{ \"showInShelf\": true , \"id\": \"window\" }");
194 ASSERT_TRUE(window);
195
196 // Ensure that the window created is marked as shown in shelf.
197 EXPECT_TRUE(window->show_in_shelf());
198
199 CloseAppWindow(window);
200 }
201
189 } // namespace extensions 202 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/app_window/app_window.cc ('k') | extensions/common/api/app_window.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698