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

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

Issue 46078: Mac bookmark work. ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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/browser.h ('k') | chrome/browser/browser_prefs.cc » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/browser.h" 5 #include "chrome/browser/browser.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/idle_timer.h" 8 #include "base/idle_timer.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 if (!command_line.HasSwitch(switches::kEnableUserDataDirProfiles)) 984 if (!command_line.HasSwitch(switches::kEnableUserDataDirProfiles))
985 return; 985 return;
986 UserMetrics::RecordAction(L"CreateProfile", profile_); 986 UserMetrics::RecordAction(L"CreateProfile", profile_);
987 window_->ShowNewProfileDialog(); 987 window_->ShowNewProfileDialog();
988 } 988 }
989 989
990 void Browser::OpenBugReportDialog() { 990 void Browser::OpenBugReportDialog() {
991 UserMetrics::RecordAction(L"ReportBug", profile_); 991 UserMetrics::RecordAction(L"ReportBug", profile_);
992 window_->ShowReportBugDialog(); 992 window_->ShowReportBugDialog();
993 } 993 }
994 #endif // #if defined(OS_WIN)
994 995
996
997 #if defined(OS_WIN) || defined(OS_MACOSX)
995 void Browser::ToggleBookmarkBar() { 998 void Browser::ToggleBookmarkBar() {
996 UserMetrics::RecordAction(L"ShowBookmarksBar", profile_); 999 UserMetrics::RecordAction(L"ShowBookmarksBar", profile_);
997 window_->ToggleBookmarkBar(); 1000 window_->ToggleBookmarkBar();
998 } 1001 }
1002 #endif
999 1003
1004 #if defined(OS_WIN)
1000 void Browser::OpenBookmarkManager() { 1005 void Browser::OpenBookmarkManager() {
1001 UserMetrics::RecordAction(L"ShowBookmarkManager", profile_); 1006 UserMetrics::RecordAction(L"ShowBookmarkManager", profile_);
1002 window_->ShowBookmarkManager(); 1007 window_->ShowBookmarkManager();
1003 } 1008 }
1004 #endif // #if defined(OS_WIN) 1009 #endif // #if defined(OS_WIN)
1005 1010
1006 void Browser::ShowHistoryTab() { 1011 void Browser::ShowHistoryTab() {
1007 UserMetrics::RecordAction(L"ShowHistory", profile_); 1012 UserMetrics::RecordAction(L"ShowHistory", profile_);
1008 ShowSingleDOMUITab(GURL(chrome::kChromeUIHistoryURL)); 1013 ShowSingleDOMUITab(GURL(chrome::kChromeUIHistoryURL));
1009 } 1014 }
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 case IDC_OPEN_FILE: OpenFile(); break; 1239 case IDC_OPEN_FILE: OpenFile(); break;
1235 #endif 1240 #endif
1236 #if defined(OS_WIN) 1241 #if defined(OS_WIN)
1237 case IDC_CREATE_SHORTCUTS: OpenCreateShortcutsDialog(); break; 1242 case IDC_CREATE_SHORTCUTS: OpenCreateShortcutsDialog(); break;
1238 case IDC_DEBUGGER: OpenDebuggerWindow(); break; 1243 case IDC_DEBUGGER: OpenDebuggerWindow(); break;
1239 case IDC_JS_CONSOLE: OpenJavaScriptConsole(); break; 1244 case IDC_JS_CONSOLE: OpenJavaScriptConsole(); break;
1240 case IDC_TASK_MANAGER: OpenTaskManager(); break; 1245 case IDC_TASK_MANAGER: OpenTaskManager(); break;
1241 case IDC_SELECT_PROFILE: OpenSelectProfileDialog(); break; 1246 case IDC_SELECT_PROFILE: OpenSelectProfileDialog(); break;
1242 case IDC_NEW_PROFILE: OpenNewProfileDialog(); break; 1247 case IDC_NEW_PROFILE: OpenNewProfileDialog(); break;
1243 case IDC_REPORT_BUG: OpenBugReportDialog(); break; 1248 case IDC_REPORT_BUG: OpenBugReportDialog(); break;
1249 #endif
1250
1251 #if defined(OS_WIN) || defined(OS_MACOSX)
1244 case IDC_SHOW_BOOKMARK_BAR: ToggleBookmarkBar(); break; 1252 case IDC_SHOW_BOOKMARK_BAR: ToggleBookmarkBar(); break;
1253 #endif
1254
1255 #if defined(OS_WIN)
1245 case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager(); break; 1256 case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager(); break;
1246 #endif 1257 #endif
1247 case IDC_SHOW_HISTORY: ShowHistoryTab(); break; 1258 case IDC_SHOW_HISTORY: ShowHistoryTab(); break;
1248 case IDC_SHOW_DOWNLOADS: ShowDownloadsTab(); break; 1259 case IDC_SHOW_DOWNLOADS: ShowDownloadsTab(); break;
1249 #if defined(OS_WIN) 1260 #if defined(OS_WIN)
1250 #ifdef CHROME_PERSONALIZATION 1261 #ifdef CHROME_PERSONALIZATION
1251 case IDC_P13N_INFO: 1262 case IDC_P13N_INFO:
1252 Personalization::HandleMenuItemClick(profile()); break; 1263 Personalization::HandleMenuItemClick(profile()); break;
1253 #endif 1264 #endif
1254 case IDC_CLEAR_BROWSING_DATA: OpenClearBrowsingDataDialog(); break; 1265 case IDC_CLEAR_BROWSING_DATA: OpenClearBrowsingDataDialog(); break;
(...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after
2491 2502
2492 // We need to register the window position pref. 2503 // We need to register the window position pref.
2493 std::wstring window_pref(prefs::kBrowserWindowPlacement); 2504 std::wstring window_pref(prefs::kBrowserWindowPlacement);
2494 window_pref.append(L"_"); 2505 window_pref.append(L"_");
2495 window_pref.append(app_name); 2506 window_pref.append(app_name);
2496 PrefService* prefs = g_browser_process->local_state(); 2507 PrefService* prefs = g_browser_process->local_state();
2497 DCHECK(prefs); 2508 DCHECK(prefs);
2498 2509
2499 prefs->RegisterDictionaryPref(window_pref.c_str()); 2510 prefs->RegisterDictionaryPref(window_pref.c_str());
2500 } 2511 }
OLDNEW
« no previous file with comments | « chrome/browser/browser.h ('k') | chrome/browser/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698