| 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 "apps/launcher.h" | 5 #include "apps/launcher.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 968 } | 968 } |
| 969 | 969 |
| 970 bool seen() const { | 970 bool seen() const { |
| 971 return seen_; | 971 return seen_; |
| 972 } | 972 } |
| 973 | 973 |
| 974 // ExtensionRegistryObserver: | 974 // ExtensionRegistryObserver: |
| 975 void OnExtensionWillBeInstalled(content::BrowserContext* browser_context, | 975 void OnExtensionWillBeInstalled(content::BrowserContext* browser_context, |
| 976 const extensions::Extension* extension, | 976 const extensions::Extension* extension, |
| 977 bool is_update, | 977 bool is_update, |
| 978 bool from_ephemeral, | |
| 979 const std::string& old_name) override { | 978 const std::string& old_name) override { |
| 980 EXPECT_FALSE(seen_); | 979 EXPECT_FALSE(seen_); |
| 981 seen_ = true; | 980 seen_ = true; |
| 982 } | 981 } |
| 983 | 982 |
| 984 private: | 983 private: |
| 985 bool seen_; | 984 bool seen_; |
| 986 extensions::ExtensionRegistry* registry_; | 985 extensions::ExtensionRegistry* registry_; |
| 987 }; | 986 }; |
| 988 | 987 |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1375 // Now check that the app window's default zoom, and actual zoom level, | 1374 // Now check that the app window's default zoom, and actual zoom level, |
| 1376 // have not been changed from the default. | 1375 // have not been changed from the default. |
| 1377 WebContents* web_contents = GetFirstAppWindowWebContents(); | 1376 WebContents* web_contents = GetFirstAppWindowWebContents(); |
| 1378 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( | 1377 content::HostZoomMap* app_host_zoom_map = content::HostZoomMap::Get( |
| 1379 web_contents->GetSiteInstance()); | 1378 web_contents->GetSiteInstance()); |
| 1380 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); | 1379 EXPECT_EQ(0, app_host_zoom_map->GetDefaultZoomLevel()); |
| 1381 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); | 1380 EXPECT_EQ(0, app_host_zoom_map->GetZoomLevel(web_contents)); |
| 1382 } | 1381 } |
| 1383 | 1382 |
| 1384 } // namespace extensions | 1383 } // namespace extensions |
| OLD | NEW |