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

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

Issue 1036173002: Animate showing / hiding the location bar for bookmark apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix stuffup Created 5 years, 8 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"
11 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/extensions/extension_util.h" 12 #include "chrome/browser/extensions/extension_util.h"
13 #include "chrome/browser/ui/browser_finder.h" 13 #include "chrome/browser/ui/browser_finder.h"
14 #include "chrome/browser/ui/browser_iterator.h" 14 #include "chrome/browser/ui/browser_iterator.h"
15 #include "chrome/browser/ui/extensions/app_launch_params.h" 15 #include "chrome/browser/ui/extensions/app_launch_params.h"
16 #include "chrome/browser/ui/extensions/application_launch.h" 16 #include "chrome/browser/ui/extensions/application_launch.h"
17 #include "chrome/browser/ui/extensions/bookmark_app_browser_controller.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 18 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/browser/web_applications/web_app.h" 19 #include "chrome/browser/web_applications/web_app.h"
19 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
20 #include "chrome/test/base/ui_test_utils.h" 21 #include "chrome/test/base/ui_test_utils.h"
21 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
22 #include "extensions/browser/extension_registry.h" 23 #include "extensions/browser/extension_registry.h"
23 #include "extensions/common/constants.h" 24 #include "extensions/common/constants.h"
24 #include "extensions/common/extension.h" 25 #include "extensions/common/extension.h"
25 #include "extensions/common/extension_set.h" 26 #include "extensions/common/extension_set.h"
26 27
27 using content::WebContents; 28 using content::WebContents;
28 using extensions::Extension; 29 using extensions::Extension;
29 30
30 typedef ExtensionBrowserTest BookmarkAppTest; 31 typedef ExtensionBrowserTest BookmarkAppTest;
31 32
32 namespace { 33 namespace {
33 34
34 // Used by ShouldLocationBarForXXX. Performs a navigation and then checks that 35 // Used by ShouldLocationBarForXXX. Performs a navigation and then checks that
35 // the location bar visibility is as expcted. 36 // the location bar visibility is as expcted.
36 void NavigateAndCheckForLocationBar(Browser* browser, 37 void NavigateAndCheckForLocationBar(Browser* browser,
37 const std::string& url_string, 38 const std::string& url_string,
38 bool expected_visibility) { 39 bool expected_visibility) {
39 GURL url(url_string); 40 GURL url(url_string);
40 ui_test_utils::NavigateToURL(browser, url); 41 ui_test_utils::NavigateToURL(browser, url);
41 EXPECT_EQ(expected_visibility, 42 EXPECT_EQ(expected_visibility,
42 browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)); 43 browser->bookmark_app_controller()->ShouldShowLocationBar());
43 } 44 }
44 45
45 } // namespace 46 } // namespace
46 47
47 // Check that the location bar is shown correctly for HTTP bookmark apps. 48 // Check that the location bar is shown correctly for HTTP bookmark apps.
48 IN_PROC_BROWSER_TEST_F(BookmarkAppTest, 49 IN_PROC_BROWSER_TEST_F(BookmarkAppTest,
49 ShouldShowLocationBarForHTTPBookmarkApp) { 50 ShouldShowLocationBarForHTTPBookmarkApp) {
50 base::CommandLine::ForCurrentProcess()->AppendSwitch( 51 base::CommandLine::ForCurrentProcess()->AppendSwitch(
51 switches::kEnableNewBookmarkApps); 52 switches::kEnableNewBookmarkApps);
52 ASSERT_TRUE(test_server()->Start()); 53 ASSERT_TRUE(test_server()->Start());
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 EXPECT_FALSE( 238 EXPECT_FALSE(
238 dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME)); 239 dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME));
239 EXPECT_EQ(browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH, 240 EXPECT_EQ(browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH,
240 bookmark_app_browser->SupportsWindowFeature( 241 bookmark_app_browser->SupportsWindowFeature(
241 Browser::FEATURE_WEBAPPFRAME)); 242 Browser::FEATURE_WEBAPPFRAME));
242 EXPECT_FALSE(packaged_app_browser->SupportsWindowFeature( 243 EXPECT_FALSE(packaged_app_browser->SupportsWindowFeature(
243 Browser::FEATURE_WEBAPPFRAME)); 244 Browser::FEATURE_WEBAPPFRAME));
244 245
245 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window); 246 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
246 } 247 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/bookmark_app_browser_controller.cc ('k') | chrome/browser/ui/location_bar/location_bar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698