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

Unified Diff: chrome/test/gpu/webgl_infobar_browsertest.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/data/webui/history_ui_browsertest.cc ('k') | chrome/test/perf/mach_ports_performancetest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/gpu/webgl_infobar_browsertest.cc
diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc
index e9e1712c60ceeafe3547deadc8dc9736d60030d7..f906aca3bc2b0150efa4d93e90a2e23629ee59b1 100644
--- a/chrome/test/gpu/webgl_infobar_browsertest.cc
+++ b/chrome/test/gpu/webgl_infobar_browsertest.cc
@@ -25,10 +25,10 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
#include "content/public/common/content_paths.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/test/browser_test_utils.h"
#include "gpu/config/gpu_test_config.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/page_transition_types.h"
#include "ui/gl/gl_implementation.h"
namespace {
@@ -42,9 +42,9 @@ void SimulateGPUCrash(Browser* browser) {
chrome::NavigateParams params(
browser,
GURL(content::kChromeUIGpuCrashURL),
- static_cast<content::PageTransition>(
- content::PAGE_TRANSITION_TYPED |
- content::PAGE_TRANSITION_FROM_ADDRESS_BAR));
+ ui::PageTransitionFromInt(
+ ui::PAGE_TRANSITION_TYPED |
+ ui::PAGE_TRANSITION_FROM_ADDRESS_BAR));
params.disposition = NEW_BACKGROUND_TAB;
chrome::Navigate(&params);
}
« no previous file with comments | « chrome/test/data/webui/history_ui_browsertest.cc ('k') | chrome/test/perf/mach_ports_performancetest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698