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 24 matching lines...) Expand all Loading... |
35 const char kHashMark[] = "#"; | 35 const char kHashMark[] = "#"; |
36 | 36 |
37 void OpenBookmarkManagerWithHash(Browser* browser, | 37 void OpenBookmarkManagerWithHash(Browser* browser, |
38 const std::string& action, | 38 const std::string& action, |
39 int64 node_id) { | 39 int64 node_id) { |
40 content::RecordAction(UserMetricsAction("ShowBookmarkManager")); | 40 content::RecordAction(UserMetricsAction("ShowBookmarkManager")); |
41 content::RecordAction(UserMetricsAction("ShowBookmarks")); | 41 content::RecordAction(UserMetricsAction("ShowBookmarks")); |
42 NavigateParams params(GetSingletonTabNavigateParams( | 42 NavigateParams params(GetSingletonTabNavigateParams( |
43 browser, | 43 browser, |
44 GURL(kChromeUIBookmarksURL).Resolve( | 44 GURL(kChromeUIBookmarksURL).Resolve( |
45 StringPrintf("/#%s%s", action.c_str(), | 45 base::StringPrintf("/#%s%s", action.c_str(), |
46 base::Int64ToString(node_id).c_str())))); | 46 base::Int64ToString(node_id).c_str())))); |
47 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; | 47 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; |
48 ShowSingletonTabOverwritingNTP(browser, params); | 48 ShowSingletonTabOverwritingNTP(browser, params); |
49 } | 49 } |
50 | 50 |
51 void NavigateToSingletonTab(Browser* browser, const GURL& url) { | 51 void NavigateToSingletonTab(Browser* browser, const GURL& url) { |
52 NavigateParams params(GetSingletonTabNavigateParams(browser, url)); | 52 NavigateParams params(GetSingletonTabNavigateParams(browser, url)); |
53 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; | 53 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; |
54 ShowSingletonTabOverwritingNTP(browser, params); | 54 ShowSingletonTabOverwritingNTP(browser, params); |
55 } | 55 } |
56 | 56 |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 const std::string& service, | 244 const std::string& service, |
245 const GURL& continue_url) { | 245 const GURL& continue_url) { |
246 GURL url(GaiaUrls::GetInstance()->service_login_url()); | 246 GURL url(GaiaUrls::GetInstance()->service_login_url()); |
247 url = net::AppendQueryParameter(url, "service", service); | 247 url = net::AppendQueryParameter(url, "service", service); |
248 if (continue_url.is_valid()) | 248 if (continue_url.is_valid()) |
249 url = net::AppendQueryParameter(url, "continue", continue_url.spec()); | 249 url = net::AppendQueryParameter(url, "continue", continue_url.spec()); |
250 NavigateToSingletonTab(browser, url); | 250 NavigateToSingletonTab(browser, url); |
251 } | 251 } |
252 | 252 |
253 } // namespace chrome | 253 } // namespace chrome |
OLD | NEW |