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

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

Issue 7701015: Making BrowserNavigator open file browser singleton tab respecting URLs ref value (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "Changing comments in browsertest" Created 9 years, 4 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
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_navigator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 params.window_action = browser::NavigateParams::SHOW_WINDOW; 1248 params.window_action = browser::NavigateParams::SHOW_WINDOW;
1249 params.user_gesture = true; 1249 params.user_gesture = true;
1250 return params; 1250 return params;
1251 } 1251 }
1252 1252
1253 void Browser::ShowSingletonTab(const GURL& url) { 1253 void Browser::ShowSingletonTab(const GURL& url) {
1254 browser::NavigateParams params(GetSingletonTabNavigateParams(url)); 1254 browser::NavigateParams params(GetSingletonTabNavigateParams(url));
1255 browser::Navigate(&params); 1255 browser::Navigate(&params);
1256 } 1256 }
1257 1257
1258 void Browser::ShowSingletonTabRespectRef(const GURL& url) {
1259 browser::NavigateParams params(GetSingletonTabNavigateParams(url));
1260 params.ref_behavior = browser::NavigateParams::RESPECT_REF;
1261 browser::Navigate(&params);
1262 }
1263
1258 void Browser::ShowSingletonTabOverwritingNTP( 1264 void Browser::ShowSingletonTabOverwritingNTP(
1259 const browser::NavigateParams& params) { 1265 const browser::NavigateParams& params) {
1260 browser::NavigateParams local_params(params); 1266 browser::NavigateParams local_params(params);
1261 TabContents* contents = GetSelectedTabContents(); 1267 TabContents* contents = GetSelectedTabContents();
1262 if (contents) { 1268 if (contents) {
1263 const GURL& contents_url = contents->GetURL(); 1269 const GURL& contents_url = contents->GetURL();
1264 if ((contents_url == GURL(chrome::kChromeUINewTabURL) || 1270 if ((contents_url == GURL(chrome::kChromeUINewTabURL) ||
1265 contents_url == GURL(chrome::kAboutBlankURL)) && 1271 contents_url == GURL(chrome::kAboutBlankURL)) &&
1266 browser::GetIndexOfSingletonTab(&local_params) < 0) { 1272 browser::GetIndexOfSingletonTab(&local_params) < 0) {
1267 local_params.disposition = CURRENT_TAB; 1273 local_params.disposition = CURRENT_TAB;
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
2103 } 2109 }
2104 2110
2105 void Browser::OpenSearchEngineOptionsDialog() { 2111 void Browser::OpenSearchEngineOptionsDialog() {
2106 UserMetrics::RecordAction(UserMetricsAction("EditSearchEngines")); 2112 UserMetrics::RecordAction(UserMetricsAction("EditSearchEngines"));
2107 ShowOptionsTab(chrome::kSearchEnginesSubPage); 2113 ShowOptionsTab(chrome::kSearchEnginesSubPage);
2108 } 2114 }
2109 2115
2110 #if defined(FILE_MANAGER_EXTENSION) 2116 #if defined(FILE_MANAGER_EXTENSION)
2111 void Browser::OpenFileManager() { 2117 void Browser::OpenFileManager() {
2112 UserMetrics::RecordAction(UserMetricsAction("OpenFileManager")); 2118 UserMetrics::RecordAction(UserMetricsAction("OpenFileManager"));
2113 ShowSingletonTab(GURL(chrome::kChromeUIFileManagerURL)); 2119 ShowSingletonTabRespectRef(GURL(
2120 std::string(chrome::kChromeUIFileManagerURL) + "#/"));
SeRya 2011/08/25 09:19:51 This change forces file manager to open up in the
2114 } 2121 }
2115 #endif 2122 #endif
2116 2123
2117 #if defined(OS_CHROMEOS) 2124 #if defined(OS_CHROMEOS)
2118 void Browser::OpenSystemOptionsDialog() { 2125 void Browser::OpenSystemOptionsDialog() {
2119 UserMetrics::RecordAction(UserMetricsAction("OpenSystemOptionsDialog")); 2126 UserMetrics::RecordAction(UserMetricsAction("OpenSystemOptionsDialog"));
2120 ShowOptionsTab(chrome::kSystemOptionsSubPage); 2127 ShowOptionsTab(chrome::kSystemOptionsSubPage);
2121 } 2128 }
2122 2129
2123 void Browser::OpenInternetOptionsDialog() { 2130 void Browser::OpenInternetOptionsDialog() {
(...skipping 2761 matching lines...) Expand 10 before | Expand all | Expand 10 after
4885 } 4892 }
4886 4893
4887 void Browser::ShowSyncSetup() { 4894 void Browser::ShowSyncSetup() {
4888 ProfileSyncService* service = 4895 ProfileSyncService* service =
4889 profile()->GetOriginalProfile()->GetProfileSyncService(); 4896 profile()->GetOriginalProfile()->GetProfileSyncService();
4890 if (service->HasSyncSetupCompleted()) 4897 if (service->HasSyncSetupCompleted())
4891 ShowOptionsTab(chrome::kSyncSetupSubPage); 4898 ShowOptionsTab(chrome::kSyncSetupSubPage);
4892 else 4899 else
4893 service->ShowLoginDialog(); 4900 service->ShowLoginDialog();
4894 } 4901 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_navigator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698