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

Side by Side Diff: chrome/browser/apps/app_window_browsertest.cc

Issue 267303003: Promote chrome app window frame color to stable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit Created 6 years, 7 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 | « no previous file | chrome/browser/extensions/api/app_window/app_window_api.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "apps/app_window_geometry_cache.h" 5 #include "apps/app_window_geometry_cache.h"
6 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.h"
7 #include "chrome/browser/extensions/extension_test_message_listener.h" 7 #include "chrome/browser/extensions/extension_test_message_listener.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/extensions/application_launch.h" 10 #include "chrome/browser/ui/extensions/application_launch.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 ASSERT_TRUE( 242 ASSERT_TRUE(
243 RunAppWindowAPITestAndWaitForRoundTrip("testBadging")) << message_; 243 RunAppWindowAPITestAndWaitForRoundTrip("testBadging")) << message_;
244 } 244 }
245 245
246 // TODO(benwells): Implement on Mac. 246 // TODO(benwells): Implement on Mac.
247 #if defined(USE_AURA) 247 #if defined(USE_AURA)
248 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { 248 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) {
249 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; 249 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
250 } 250 }
251 251
252 // TODO(benwells): Remove this test once all the things are merged together. It
253 // is currently present as this feature was previously disabled on stable
254 // channel, so the test is to ensure it has all been re-enabled properly.
252 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) { 255 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) {
253 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); 256 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE);
254 ASSERT_TRUE(RunAppWindowAPITest("testFrameColorsInStable")) << message_; 257 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
255 } 258 }
256 #endif 259 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/app_window/app_window_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698