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

Side by Side Diff: chrome/browser/ui/chrome_pages.cc

Issue 12995025: [Mac] DownloadShelf should be notified when autoclosing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: + NSTrackingInVisibleRect Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 NavigateParams params( 80 NavigateParams params(
81 GetSingletonTabNavigateParams(browser, GURL(kChromeUIHistoryURL))); 81 GetSingletonTabNavigateParams(browser, GURL(kChromeUIHistoryURL)));
82 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; 82 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
83 ShowSingletonTabOverwritingNTP(browser, params); 83 ShowSingletonTabOverwritingNTP(browser, params);
84 } 84 }
85 85
86 void ShowDownloads(Browser* browser) { 86 void ShowDownloads(Browser* browser) {
87 content::RecordAction(UserMetricsAction("ShowDownloads")); 87 content::RecordAction(UserMetricsAction("ShowDownloads"));
88 if (browser->window()) { 88 if (browser->window()) {
89 DownloadShelf* shelf = browser->window()->GetDownloadShelf(); 89 DownloadShelf* shelf = browser->window()->GetDownloadShelf();
90 // The downloads page is always shown in response to a user action.
90 if (shelf->IsShowing()) 91 if (shelf->IsShowing())
91 shelf->Close(); 92 shelf->Close(DownloadShelf::USER_ACTION);
92 } 93 }
93 ShowSingletonTabOverwritingNTP( 94 ShowSingletonTabOverwritingNTP(
94 browser, 95 browser,
95 GetSingletonTabNavigateParams(browser, GURL(kChromeUIDownloadsURL))); 96 GetSingletonTabNavigateParams(browser, GURL(kChromeUIDownloadsURL)));
96 } 97 }
97 98
98 void ShowExtensions(Browser* browser, 99 void ShowExtensions(Browser* browser,
99 const std::string& extension_to_highlight) { 100 const std::string& extension_to_highlight) {
100 content::RecordAction(UserMetricsAction("ShowExtensions")); 101 content::RecordAction(UserMetricsAction("ShowExtensions"));
101 NavigateParams params( 102 NavigateParams params(
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 const std::string& service, 245 const std::string& service,
245 const GURL& continue_url) { 246 const GURL& continue_url) {
246 GURL url(GaiaUrls::GetInstance()->service_login_url()); 247 GURL url(GaiaUrls::GetInstance()->service_login_url());
247 url = net::AppendQueryParameter(url, "service", service); 248 url = net::AppendQueryParameter(url, "service", service);
248 if (continue_url.is_valid()) 249 if (continue_url.is_valid())
249 url = net::AppendQueryParameter(url, "continue", continue_url.spec()); 250 url = net::AppendQueryParameter(url, "continue", continue_url.spec());
250 NavigateToSingletonTab(browser, url); 251 NavigateToSingletonTab(browser, url);
251 } 252 }
252 253
253 } // namespace chrome 254 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/download/test_download_shelf.cc ('k') | chrome/browser/ui/cocoa/download/download_shelf_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698