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

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

Issue 337034: Remove the browser_sync flag. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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/gtk/bookmark_bar_gtk.cc ('k') | chrome/browser/profile.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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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/gtk/standard_menus.h" 5 #include "chrome/browser/gtk/standard_menus.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 #include <gdk/gdkkeysyms.h> 8 #include <gdk/gdkkeysyms.h>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 GDK_b, GDK_CONTROL_MASK }, 87 GDK_b, GDK_CONTROL_MASK },
88 { MENU_SEPARATOR }, 88 { MENU_SEPARATOR },
89 { MENU_NORMAL, IDC_SHOW_HISTORY, IDS_SHOW_HISTORY, 0, NULL, 89 { MENU_NORMAL, IDC_SHOW_HISTORY, IDS_SHOW_HISTORY, 0, NULL,
90 GDK_h, GDK_CONTROL_MASK }, 90 GDK_h, GDK_CONTROL_MASK },
91 { MENU_NORMAL, IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER, 0, NULL, 91 { MENU_NORMAL, IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER, 0, NULL,
92 GDK_b, GDK_CONTROL_MASK | GDK_SHIFT_MASK }, 92 GDK_b, GDK_CONTROL_MASK | GDK_SHIFT_MASK },
93 { MENU_NORMAL, IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS, 0, NULL, 93 { MENU_NORMAL, IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS, 0, NULL,
94 GDK_j, GDK_CONTROL_MASK }, 94 GDK_j, GDK_CONTROL_MASK },
95 { MENU_NORMAL, IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS }, 95 { MENU_NORMAL, IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS },
96 { MENU_SEPARATOR }, 96 { MENU_SEPARATOR },
97 #if defined(BROWSER_SYNC)
98 { MENU_NORMAL, IDC_SYNC_BOOKMARKS, IDS_SYNC_MY_BOOKMARKS_LABEL}, 97 { MENU_NORMAL, IDC_SYNC_BOOKMARKS, IDS_SYNC_MY_BOOKMARKS_LABEL},
99 { MENU_SEPARATOR }, 98 { MENU_SEPARATOR },
100 #endif
101 { MENU_NORMAL, IDC_OPTIONS, IDS_OPTIONS, IDS_PRODUCT_NAME }, 99 { MENU_NORMAL, IDC_OPTIONS, IDS_OPTIONS, IDS_PRODUCT_NAME },
102 { MENU_NORMAL, IDC_ABOUT, IDS_ABOUT, IDS_PRODUCT_NAME }, 100 { MENU_NORMAL, IDC_ABOUT, IDS_ABOUT, IDS_PRODUCT_NAME },
103 { MENU_NORMAL, IDC_HELP_PAGE, IDS_HELP_PAGE, 0, NULL, GDK_F1 }, 101 { MENU_NORMAL, IDC_HELP_PAGE, IDS_HELP_PAGE, 0, NULL, GDK_F1 },
104 #if !defined(OS_CHROMEOS) 102 #if !defined(OS_CHROMEOS)
105 { MENU_SEPARATOR }, 103 { MENU_SEPARATOR },
106 { MENU_NORMAL, IDC_EXIT, IDS_EXIT, 0, NULL, GDK_q, 104 { MENU_NORMAL, IDC_EXIT, IDS_EXIT, 0, NULL, GDK_q,
107 GDK_CONTROL_MASK | GDK_SHIFT_MASK }, 105 GDK_CONTROL_MASK | GDK_SHIFT_MASK },
108 #endif 106 #endif
109 { MENU_END } 107 { MENU_END }
110 }; 108 };
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 developer_menu_materials : developer_menu_materials_no_inspector; 144 developer_menu_materials : developer_menu_materials_no_inspector;
147 } 145 }
148 } 146 }
149 147
150 return standard_page_menu_materials; 148 return standard_page_menu_materials;
151 } 149 }
152 150
153 const MenuCreateMaterial* GetStandardAppMenu() { 151 const MenuCreateMaterial* GetStandardAppMenu() {
154 return standard_app_menu_materials; 152 return standard_app_menu_materials;
155 } 153 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/bookmark_bar_gtk.cc ('k') | chrome/browser/profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698