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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/browser.cc

Issue 9582032: [uber page] Integrate history into uber page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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
« chrome/browser/resources/uber/uber.html ('K') | « chrome/browser/resources/uber/uber_frame.html ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | chrome/browser/ui/webui/uber/uber_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc (revision 124713)
+++ chrome/browser/ui/browser.cc (working copy)
@@ -2318,8 +2318,16 @@
void Browser::ShowHistoryTab() {
content::RecordAction(UserMetricsAction("ShowHistory"));
- ShowSingletonTabOverwritingNTP(
- GetSingletonTabNavigateParams(GURL(chrome::kChromeUIHistoryURL)));
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage)) {
+ ShowSingletonTabOverwritingNTP(
+ GetSingletonTabNavigateParams(GURL(chrome::kChromeUIHistoryFrameURL)));
+ } else {
+ browser::NavigateParams params(GetSingletonTabNavigateParams(
+ GURL(std::string(chrome::kChromeUIUberURL) +
+ chrome::kChromeUIHistoryHost)));
+ params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
+ ShowSingletonTabOverwritingNTP(params);
+ }
}
void Browser::ShowDownloadsTab() {
« chrome/browser/resources/uber/uber.html ('K') | « chrome/browser/resources/uber/uber_frame.html ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | chrome/browser/ui/webui/uber/uber_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698