| OLD | NEW |
| 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 <stddef.h> |
| 6 |
| 5 #include "apps/launcher.h" | 7 #include "apps/launcher.h" |
| 6 #include "base/bind.h" | 8 #include "base/bind.h" |
| 7 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 8 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| 9 #include "base/files/scoped_temp_dir.h" | 11 #include "base/files/scoped_temp_dir.h" |
| 12 #include "base/macros.h" |
| 10 #include "base/prefs/pref_service.h" | 13 #include "base/prefs/pref_service.h" |
| 11 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 16 #include "build/build_config.h" |
| 13 #include "chrome/app/chrome_command_ids.h" | 17 #include "chrome/app/chrome_command_ids.h" |
| 14 #include "chrome/browser/apps/app_browsertest_util.h" | 18 #include "chrome/browser/apps/app_browsertest_util.h" |
| 15 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" |
| 16 #include "chrome/browser/devtools/devtools_window.h" | 20 #include "chrome/browser/devtools/devtools_window.h" |
| 17 #include "chrome/browser/extensions/api/permissions/permissions_api.h" | 21 #include "chrome/browser/extensions/api/permissions/permissions_api.h" |
| 18 #include "chrome/browser/extensions/component_loader.h" | 22 #include "chrome/browser/extensions/component_loader.h" |
| 19 #include "chrome/browser/extensions/extension_browsertest.h" | 23 #include "chrome/browser/extensions/extension_browsertest.h" |
| 20 #include "chrome/browser/extensions/extension_service.h" | 24 #include "chrome/browser/extensions/extension_service.h" |
| 21 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" | 25 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" |
| 22 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
| (...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1356 // Now check that the app window's default zoom, and actual zoom level, | 1360 // Now check that the app window's default zoom, and actual zoom level, |
| 1357 // have not been changed from the default. | 1361 // have not been changed from the default. |
| 1358 WebContents* web_contents = GetFirstAppWindowWebContents(); | 1362 WebContents* web_contents = GetFirstAppWindowWebContents(); |
| 1359 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( | 1363 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( |
| 1360 web_contents->GetSiteInstance()); | 1364 web_contents->GetSiteInstance()); |
| 1361 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); | 1365 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); |
| 1362 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); | 1366 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); |
| 1363 } | 1367 } |
| 1364 | 1368 |
| 1365 } // namespace extensions | 1369 } // namespace extensions |
| OLD | NEW |