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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 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> 5 #include <stddef.h>
6 6
7 #include "apps/launcher.h" 7 #include "apps/launcher.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/stl_util.h" 13 #include "base/stl_util.h"
15 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
16 #include "build/build_config.h" 15 #include "build/build_config.h"
17 #include "chrome/app/chrome_command_ids.h" 16 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/browser/apps/app_browsertest_util.h" 17 #include "chrome/browser/apps/app_browsertest_util.h"
19 #include "chrome/browser/chrome_notification_types.h" 18 #include "chrome/browser/chrome_notification_types.h"
20 #include "chrome/browser/devtools/devtools_window.h" 19 #include "chrome/browser/devtools/devtools_window.h"
21 #include "chrome/browser/extensions/api/permissions/permissions_api.h" 20 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
22 #include "chrome/browser/extensions/component_loader.h" 21 #include "chrome/browser/extensions/component_loader.h"
23 #include "chrome/browser/extensions/extension_browsertest.h" 22 #include "chrome/browser/extensions/extension_browsertest.h"
24 #include "chrome/browser/extensions/extension_service.h" 23 #include "chrome/browser/extensions/extension_service.h"
25 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" 24 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
26 #include "chrome/browser/ui/browser.h" 25 #include "chrome/browser/ui/browser.h"
27 #include "chrome/browser/ui/extensions/app_launch_params.h" 26 #include "chrome/browser/ui/extensions/app_launch_params.h"
28 #include "chrome/browser/ui/extensions/application_launch.h" 27 #include "chrome/browser/ui/extensions/application_launch.h"
29 #include "chrome/browser/ui/tabs/tab_strip_model.h" 28 #include "chrome/browser/ui/tabs/tab_strip_model.h"
30 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" 29 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
31 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" 30 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
32 #include "chrome/common/chrome_switches.h" 31 #include "chrome/common/chrome_switches.h"
33 #include "chrome/common/url_constants.h" 32 #include "chrome/common/url_constants.h"
34 #include "chrome/test/base/test_switches.h" 33 #include "chrome/test/base/test_switches.h"
35 #include "chrome/test/base/ui_test_utils.h" 34 #include "chrome/test/base/ui_test_utils.h"
36 #include "components/pref_registry/pref_registry_syncable.h" 35 #include "components/pref_registry/pref_registry_syncable.h"
36 #include "components/prefs/pref_service.h"
37 #include "components/web_modal/web_contents_modal_dialog_manager.h" 37 #include "components/web_modal/web_contents_modal_dialog_manager.h"
38 #include "content/public/browser/devtools_agent_host.h" 38 #include "content/public/browser/devtools_agent_host.h"
39 #include "content/public/browser/host_zoom_map.h" 39 #include "content/public/browser/host_zoom_map.h"
40 #include "content/public/browser/render_process_host.h" 40 #include "content/public/browser/render_process_host.h"
41 #include "content/public/browser/render_widget_host_view.h" 41 #include "content/public/browser/render_widget_host_view.h"
42 #include "content/public/test/test_utils.h" 42 #include "content/public/test/test_utils.h"
43 #include "extensions/browser/app_window/app_window.h" 43 #include "extensions/browser/app_window/app_window.h"
44 #include "extensions/browser/app_window/app_window_registry.h" 44 #include "extensions/browser/app_window/app_window_registry.h"
45 #include "extensions/browser/app_window/native_app_window.h" 45 #include "extensions/browser/app_window/native_app_window.h"
46 #include "extensions/browser/event_router.h" 46 #include "extensions/browser/event_router.h"
(...skipping 1313 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 // 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,
1361 // have not been changed from the default. 1361 // have not been changed from the default.
1362 WebContents* web_contents = GetFirstAppWindowWebContents(); 1362 WebContents* web_contents = GetFirstAppWindowWebContents();
1363 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( 1363 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get(
1364 web_contents->GetSiteInstance()); 1364 web_contents->GetSiteInstance());
1365 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); 1365 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel());
1366 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); 1366 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents));
1367 } 1367 }
1368 1368
1369 } // namespace extensions 1369 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/app_controller_mac_browsertest.mm ('k') | chrome/browser/apps/app_launch_for_metro_restart_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698