| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/views/bookmark_manager_view.h" | 5 #include "chrome/browser/views/bookmark_manager_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/gfx/canvas.h" | 9 #include "app/gfx/canvas.h" |
| 10 #include "app/gfx/color_utils.h" | 10 #include "app/gfx/color_utils.h" |
| (...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 788 views::MenuItemView menu(this); | 788 views::MenuItemView menu(this); |
| 789 menu.AppendMenuItemWithLabel( | 789 menu.AppendMenuItemWithLabel( |
| 790 IDS_BOOKMARK_MANAGER_IMPORT_MENU, | 790 IDS_BOOKMARK_MANAGER_IMPORT_MENU, |
| 791 l10n_util::GetString(IDS_BOOKMARK_MANAGER_IMPORT_MENU)); | 791 l10n_util::GetString(IDS_BOOKMARK_MANAGER_IMPORT_MENU)); |
| 792 menu.AppendMenuItemWithLabel( | 792 menu.AppendMenuItemWithLabel( |
| 793 IDS_BOOKMARK_MANAGER_EXPORT_MENU, | 793 IDS_BOOKMARK_MANAGER_EXPORT_MENU, |
| 794 l10n_util::GetString(IDS_BOOKMARK_MANAGER_EXPORT_MENU)); | 794 l10n_util::GetString(IDS_BOOKMARK_MANAGER_EXPORT_MENU)); |
| 795 views::MenuItemView::AnchorPosition anchor = | 795 views::MenuItemView::AnchorPosition anchor = |
| 796 UILayoutIsRightToLeft() ? views::MenuItemView::TOPRIGHT : | 796 UILayoutIsRightToLeft() ? views::MenuItemView::TOPRIGHT : |
| 797 views::MenuItemView::TOPLEFT; | 797 views::MenuItemView::TOPLEFT; |
| 798 menu.RunMenuAt(GetWidget()->GetNativeView(), gfx::Rect(x, y, 0, 0), anchor, | 798 menu.RunMenuAt(GetWidget()->GetNativeView(), NULL, gfx::Rect(x, y, 0, 0), |
| 799 true); | 799 anchor, true); |
| 800 } | 800 } |
| 801 | 801 |
| 802 void BookmarkManagerView::ShowImportBookmarksFileChooser() { | 802 void BookmarkManagerView::ShowImportBookmarksFileChooser() { |
| 803 if (select_file_dialog_.get()) | 803 if (select_file_dialog_.get()) |
| 804 select_file_dialog_->ListenerDestroyed(); | 804 select_file_dialog_->ListenerDestroyed(); |
| 805 | 805 |
| 806 SelectFileDialog::FileTypeInfo file_type_info; | 806 SelectFileDialog::FileTypeInfo file_type_info; |
| 807 file_type_info.extensions.resize(1); | 807 file_type_info.extensions.resize(1); |
| 808 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html")); | 808 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html")); |
| 809 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("htm")); | 809 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("htm")); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 return; | 856 return; |
| 857 if (sync_service_->HasSyncSetupCompleted()) { | 857 if (sync_service_->HasSyncSetupCompleted()) { |
| 858 ShowOptionsWindow(OPTIONS_PAGE_CONTENT, OPTIONS_GROUP_NONE, profile_); | 858 ShowOptionsWindow(OPTIONS_PAGE_CONTENT, OPTIONS_GROUP_NONE, profile_); |
| 859 } else { | 859 } else { |
| 860 sync_service_->EnableForUser(); | 860 sync_service_->EnableForUser(); |
| 861 ProfileSyncService::SyncEvent( | 861 ProfileSyncService::SyncEvent( |
| 862 ProfileSyncService::START_FROM_BOOKMARK_MANAGER); | 862 ProfileSyncService::START_FROM_BOOKMARK_MANAGER); |
| 863 } | 863 } |
| 864 } | 864 } |
| 865 #endif // defined(BROWSER_SYNC) | 865 #endif // defined(BROWSER_SYNC) |
| OLD | NEW |