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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm

Issue 1309583002: [Mac] Enable MacViews bookmark editor behind --enable-mac-views-dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@modal
Patch Set: Address comments Created 5 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
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 <stack> 5 #include <stack>
6 6
7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h" 7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h"
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/mac/bundle_locations.h" 11 #include "base/mac/bundle_locations.h"
12 #include "base/strings/sys_string_conversions.h" 12 #include "base/strings/sys_string_conversions.h"
13 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
14 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" 14 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser_dialogs.h"
16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"
17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h" 20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h"
20 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 21 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
21 #include "chrome/grit/generated_resources.h" 22 #include "chrome/grit/generated_resources.h"
22 #include "components/bookmarks/browser/bookmark_model.h" 23 #include "components/bookmarks/browser/bookmark_model.h"
23 #include "components/bookmarks/managed/managed_bookmark_service.h" 24 #include "components/bookmarks/managed/managed_bookmark_service.h"
24 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/l10n/l10n_util_mac.h" 26 #include "ui/base/l10n/l10n_util_mac.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 path:(std::vector<NSUInteger>*)path 66 path:(std::vector<NSUInteger>*)path
66 root:(id)root; 67 root:(id)root;
67 @end 68 @end
68 69
69 // static; implemented for each platform. Update this function for new 70 // static; implemented for each platform. Update this function for new
70 // classes derived from BookmarkEditorBaseController. 71 // classes derived from BookmarkEditorBaseController.
71 void BookmarkEditor::Show(gfx::NativeWindow parent_window, 72 void BookmarkEditor::Show(gfx::NativeWindow parent_window,
72 Profile* profile, 73 Profile* profile,
73 const EditDetails& details, 74 const EditDetails& details,
74 Configuration configuration) { 75 Configuration configuration) {
76 if (chrome::ToolkitViewsDialogsEnabled()) {
77 chrome::ShowBookmarkEditorViews(parent_window, profile, details,
78 configuration);
79 return;
80 }
81
75 if (details.type == EditDetails::EXISTING_NODE && 82 if (details.type == EditDetails::EXISTING_NODE &&
76 details.existing_node->is_folder()) { 83 details.existing_node->is_folder()) {
77 BookmarkNameFolderController* controller = 84 BookmarkNameFolderController* controller =
78 [[BookmarkNameFolderController alloc] 85 [[BookmarkNameFolderController alloc]
79 initWithParentWindow:parent_window 86 initWithParentWindow:parent_window
80 profile:profile 87 profile:profile
81 node:details.existing_node]; 88 node:details.existing_node];
82 [controller runAsModalSheet]; 89 [controller runAsModalSheet];
83 return; 90 return;
84 } 91 }
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 } 722 }
716 723
717 // Implementing isEqual: allows the NSTreeController to preserve the selection 724 // Implementing isEqual: allows the NSTreeController to preserve the selection
718 // and open/shut state of outline items when the data changes. 725 // and open/shut state of outline items when the data changes.
719 - (BOOL)isEqual:(id)other { 726 - (BOOL)isEqual:(id)other {
720 return [other isKindOfClass:[BookmarkFolderInfo class]] && 727 return [other isKindOfClass:[BookmarkFolderInfo class]] &&
721 folderNode_ == [(BookmarkFolderInfo*)other folderNode]; 728 folderNode_ == [(BookmarkFolderInfo*)other folderNode];
722 } 729 }
723 730
724 @end 731 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_dialogs.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698