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

Side by Side Diff: chrome/browser/ui/extensions/hosted_app_browsertest.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "chrome/browser/devtools/devtools_window_testing.h" 9 #include "chrome/browser/devtools/devtools_window_testing.h"
10 #include "chrome/browser/extensions/extension_browsertest.h" 10 #include "chrome/browser/extensions/extension_browsertest.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 ASSERT_TRUE(dev_tools_browser); 246 ASSERT_TRUE(dev_tools_browser);
247 ASSERT_TRUE(bookmark_app_browser); 247 ASSERT_TRUE(bookmark_app_browser);
248 ASSERT_TRUE(bookmark_app_browser != browser()); 248 ASSERT_TRUE(bookmark_app_browser != browser());
249 ASSERT_TRUE(packaged_app_browser); 249 ASSERT_TRUE(packaged_app_browser);
250 ASSERT_TRUE(packaged_app_browser != browser()); 250 ASSERT_TRUE(packaged_app_browser != browser());
251 ASSERT_TRUE(packaged_app_browser != bookmark_app_browser); 251 ASSERT_TRUE(packaged_app_browser != bookmark_app_browser);
252 252
253 EXPECT_FALSE(browser()->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME)); 253 EXPECT_FALSE(browser()->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME));
254 EXPECT_FALSE( 254 EXPECT_FALSE(
255 dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME)); 255 dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME));
256 EXPECT_EQ(browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH, 256 EXPECT_EQ(browser()->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH,
257 bookmark_app_browser->SupportsWindowFeature( 257 bookmark_app_browser->SupportsWindowFeature(
258 Browser::FEATURE_WEBAPPFRAME)); 258 Browser::FEATURE_WEBAPPFRAME));
259 EXPECT_FALSE(packaged_app_browser->SupportsWindowFeature( 259 EXPECT_FALSE(packaged_app_browser->SupportsWindowFeature(
260 Browser::FEATURE_WEBAPPFRAME)); 260 Browser::FEATURE_WEBAPPFRAME));
261 261
262 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window); 262 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
263 } 263 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698