| 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 "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h" | 5 #include "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 | 107 |
| 108 void ExtensionSettingsUIBrowserTest::EnableErrorConsole() { | 108 void ExtensionSettingsUIBrowserTest::EnableErrorConsole() { |
| 109 error_console_override_.reset(new extensions::FeatureSwitch::ScopedOverride( | 109 error_console_override_.reset(new extensions::FeatureSwitch::ScopedOverride( |
| 110 extensions::FeatureSwitch::error_console(), true)); | 110 extensions::FeatureSwitch::error_console(), true)); |
| 111 } | 111 } |
| 112 | 112 |
| 113 void ExtensionSettingsUIBrowserTest::ShrinkWebContentsView() { | 113 void ExtensionSettingsUIBrowserTest::ShrinkWebContentsView() { |
| 114 content::WebContents* web_contents = | 114 content::WebContents* web_contents = |
| 115 browser()->tab_strip_model()->GetActiveWebContents(); | 115 browser()->tab_strip_model()->GetActiveWebContents(); |
| 116 CHECK(web_contents); | 116 CHECK(web_contents); |
| 117 ResizeWebContents(web_contents, gfx::Size(400, 400)); | 117 ResizeWebContents(web_contents, gfx::Rect(0, 0, 400, 400)); |
| 118 } | 118 } |
| 119 | 119 |
| 120 const Extension* ExtensionSettingsUIBrowserTest::InstallUnpackedExtension( | 120 const Extension* ExtensionSettingsUIBrowserTest::InstallUnpackedExtension( |
| 121 const base::FilePath& path) { | 121 const base::FilePath& path) { |
| 122 if (path.empty()) | 122 if (path.empty()) |
| 123 return nullptr; | 123 return nullptr; |
| 124 | 124 |
| 125 Profile* profile = GetProfile(); | 125 Profile* profile = GetProfile(); |
| 126 ExtensionService* service = | 126 ExtensionService* service = |
| 127 extensions::ExtensionSystem::Get(profile)->extension_service(); | 127 extensions::ExtensionSystem::Get(profile)->extension_service(); |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 iter != errors->end(); ++iter) | 195 iter != errors->end(); ++iter) |
| 196 VLOG(1) << *iter; | 196 VLOG(1) << *iter; |
| 197 | 197 |
| 198 return nullptr; | 198 return nullptr; |
| 199 } | 199 } |
| 200 | 200 |
| 201 if (!observer_->WaitForExtensionViewsToLoad()) | 201 if (!observer_->WaitForExtensionViewsToLoad()) |
| 202 return nullptr; | 202 return nullptr; |
| 203 return service->GetExtensionById(last_loaded_extension_id(), false); | 203 return service->GetExtensionById(last_loaded_extension_id(), false); |
| 204 } | 204 } |
| OLD | NEW |