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 "chrome/browser/ui/chrome_pages.h" | 5 #include "chrome/browser/ui/chrome_pages.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "chrome/browser/download/download_shelf.h" | 10 #include "chrome/browser/download/download_shelf.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 | 58 |
59 void ShowBookmarkManager(Browser* browser) { | 59 void ShowBookmarkManager(Browser* browser) { |
60 content::RecordAction(UserMetricsAction("ShowBookmarkManager")); | 60 content::RecordAction(UserMetricsAction("ShowBookmarkManager")); |
61 content::RecordAction(UserMetricsAction("ShowBookmarks")); | 61 content::RecordAction(UserMetricsAction("ShowBookmarks")); |
62 ShowSingletonTabOverwritingNTP( | 62 ShowSingletonTabOverwritingNTP( |
63 browser, | 63 browser, |
64 GetSingletonTabNavigateParams(browser, GURL(kChromeUIBookmarksURL))); | 64 GetSingletonTabNavigateParams(browser, GURL(kChromeUIBookmarksURL))); |
65 } | 65 } |
66 | 66 |
67 void ShowBookmarkManagerForNode(Browser* browser, int64 node_id) { | 67 void ShowBookmarkManagerForNode(Browser* browser, int64 node_id) { |
68 OpenBookmarkManagerWithHash(browser, "", node_id); | 68 OpenBookmarkManagerWithHash(browser, std::string(), node_id); |
69 } | 69 } |
70 | 70 |
71 void ShowHistory(Browser* browser) { | 71 void ShowHistory(Browser* browser) { |
72 content::RecordAction(UserMetricsAction("ShowHistory")); | 72 content::RecordAction(UserMetricsAction("ShowHistory")); |
73 NavigateParams params( | 73 NavigateParams params( |
74 GetSingletonTabNavigateParams(browser, GURL(kChromeUIHistoryURL))); | 74 GetSingletonTabNavigateParams(browser, GURL(kChromeUIHistoryURL))); |
75 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; | 75 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; |
76 ShowSingletonTabOverwritingNTP(browser, params); | 76 ShowSingletonTabOverwritingNTP(browser, params); |
77 } | 77 } |
78 | 78 |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 const std::string& service, | 238 const std::string& service, |
239 const GURL& continue_url) { | 239 const GURL& continue_url) { |
240 GURL url(GaiaUrls::GetInstance()->service_login_url()); | 240 GURL url(GaiaUrls::GetInstance()->service_login_url()); |
241 url = net::AppendQueryParameter(url, "service", service); | 241 url = net::AppendQueryParameter(url, "service", service); |
242 if (continue_url.is_valid()) | 242 if (continue_url.is_valid()) |
243 url = net::AppendQueryParameter(url, "continue", continue_url.spec()); | 243 url = net::AppendQueryParameter(url, "continue", continue_url.spec()); |
244 NavigateToSingletonTab(browser, url); | 244 NavigateToSingletonTab(browser, url); |
245 } | 245 } |
246 | 246 |
247 } // namespace chrome | 247 } // namespace chrome |
OLD | NEW |