| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 | 344 |
| 345 return page_title; | 345 return page_title; |
| 346 #else | 346 #else |
| 347 // Do we need to use the above code on POSIX as well? | 347 // Do we need to use the above code on POSIX as well? |
| 348 return page_title; | 348 return page_title; |
| 349 #endif | 349 #endif |
| 350 } | 350 } |
| 351 | 351 |
| 352 // Returns the app extension aptly named "App Test". | 352 // Returns the app extension aptly named "App Test". |
| 353 const Extension* GetExtension() { | 353 const Extension* GetExtension() { |
| 354 const ExtensionSet* extensions = extensions::ExtensionSystem::Get( | 354 const extensions::ExtensionSet* extensions = |
| 355 browser()->profile())->extension_service()->extensions(); | 355 extensions::ExtensionSystem::Get( |
| 356 for (ExtensionSet::const_iterator it = extensions->begin(); | 356 browser()->profile())->extension_service()->extensions(); |
| 357 for (extensions::ExtensionSet::const_iterator it = extensions->begin(); |
| 357 it != extensions->end(); ++it) { | 358 it != extensions->end(); ++it) { |
| 358 if ((*it)->name() == "App Test") | 359 if ((*it)->name() == "App Test") |
| 359 return it->get(); | 360 return it->get(); |
| 360 } | 361 } |
| 361 NOTREACHED(); | 362 NOTREACHED(); |
| 362 return NULL; | 363 return NULL; |
| 363 } | 364 } |
| 364 }; | 365 }; |
| 365 | 366 |
| 366 // Launch the app on a page with no title, check that the app title was set | 367 // Launch the app on a page with no title, check that the app title was set |
| (...skipping 2185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2552 exp_commit_size.Enlarge(wcv_resize_insets.width(), | 2553 exp_commit_size.Enlarge(wcv_resize_insets.width(), |
| 2553 wcv_resize_insets.height() + height_inset); | 2554 wcv_resize_insets.height() + height_inset); |
| 2554 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); | 2555 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
| 2555 EXPECT_EQ(exp_commit_size, wcv_commit_size2); | 2556 EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
| 2556 // Sizes of RenderWidgetHostView and WebContentsView before and after | 2557 // Sizes of RenderWidgetHostView and WebContentsView before and after |
| 2557 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. | 2558 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. |
| 2558 EXPECT_EQ(rwhv_commit_size2, | 2559 EXPECT_EQ(rwhv_commit_size2, |
| 2559 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); | 2560 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); |
| 2560 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); | 2561 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); |
| 2561 } | 2562 } |
| OLD | NEW |