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

Unified Diff: chrome/browser/chromeos/policy/consumer_management_service.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
Index: chrome/browser/chromeos/policy/consumer_management_service.cc
diff --git a/chrome/browser/chromeos/policy/consumer_management_service.cc b/chrome/browser/chromeos/policy/consumer_management_service.cc
index 232b8e8daddb69b5b834b55b2b677cf87dc01ccb..448b97d7f6a47854ac9396ab736de4fc7d7d424c 100644
--- a/chrome/browser/chromeos/policy/consumer_management_service.cc
+++ b/chrome/browser/chromeos/policy/consumer_management_service.cc
@@ -38,7 +38,6 @@
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
-#include "content/public/common/page_transition_types.h"
#include "google_apis/gaia/gaia_constants.h"
#include "google_apis/gaia/google_service_auth_error.h"
#include "grit/generated_resources.h"
@@ -46,6 +45,7 @@
#include "policy/proto/device_management_backend.pb.h"
#include "third_party/WebKit/public/web/WebTextDirection.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/page_transition_types.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/window_open_disposition.h"
#include "ui/message_center/notification.h"
@@ -514,7 +514,7 @@ void ConsumerManagementService::ShowDesktopNotificationAndResetStage(
void ConsumerManagementService::OpenSettingsPage(Profile* profile) const {
const GURL url(chrome::kChromeUISettingsURL);
- chrome::NavigateParams params(profile, url, content::PAGE_TRANSITION_LINK);
+ chrome::NavigateParams params(profile, url, ui::PAGE_TRANSITION_LINK);
params.disposition = NEW_FOREGROUND_TAB;
chrome::Navigate(&params);
}
@@ -523,7 +523,7 @@ void ConsumerManagementService::TryEnrollmentAgain(Profile* profile) const {
const GURL base_url(chrome::kChromeUISettingsURL);
const GURL url = base_url.Resolve(kConsumerManagementOverlay);
- chrome::NavigateParams params(profile, url, content::PAGE_TRANSITION_LINK);
+ chrome::NavigateParams params(profile, url, ui::PAGE_TRANSITION_LINK);
params.disposition = NEW_FOREGROUND_TAB;
chrome::Navigate(&params);
}
« no previous file with comments | « chrome/browser/chromeos/offline/offline_load_page_unittest.cc ('k') | chrome/browser/crash_recovery_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698