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

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

Issue 2511043002: [Mac] Omnibox icons active states (Closed)
Patch Set: Cleaned up Created 4 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
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 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
6 6
7 #include "base/mac/bundle_locations.h" 7 #include "base/mac/bundle_locations.h"
8 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h" 9 #include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_finder.h" 11 #include "chrome/browser/ui/browser_finder.h"
12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
13 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 13 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
14 #import "chrome/browser/ui/cocoa/bubble_sync_promo_controller.h" 14 #import "chrome/browser/ui/cocoa/bubble_sync_promo_controller.h"
15 #import "chrome/browser/ui/cocoa/info_bubble_view.h" 15 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
16 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
17 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
16 #include "chrome/browser/ui/sync/sync_promo_ui.h" 18 #include "chrome/browser/ui/sync/sync_promo_ui.h"
17 #include "chrome/grit/chromium_strings.h" 19 #include "chrome/grit/chromium_strings.h"
18 #include "chrome/grit/generated_resources.h" 20 #include "chrome/grit/generated_resources.h"
19 #include "components/bookmarks/browser/bookmark_model.h" 21 #include "components/bookmarks/browser/bookmark_model.h"
20 #include "components/bookmarks/browser/bookmark_utils.h" 22 #include "components/bookmarks/browser/bookmark_utils.h"
21 #include "components/bookmarks/managed/managed_bookmark_service.h" 23 #include "components/bookmarks/managed/managed_bookmark_service.h"
22 #include "components/signin/core/browser/signin_metrics.h" 24 #include "components/signin/core/browser/signin_metrics.h"
23 #include "content/public/browser/notification_observer.h" 25 #include "content/public/browser/notification_observer.h"
24 #include "content/public/browser/notification_registrar.h" 26 #include "content/public/browser/notification_registrar.h"
25 #include "content/public/browser/notification_service.h" 27 #include "content/public/browser/notification_service.h"
(...skipping 30 matching lines...) Expand all
56 DCHECK(managed); 58 DCHECK(managed);
57 DCHECK(node); 59 DCHECK(node);
58 if ((self = [super initWithWindowNibPath:@"BookmarkBubble" 60 if ((self = [super initWithWindowNibPath:@"BookmarkBubble"
59 parentWindow:parentWindow 61 parentWindow:parentWindow
60 anchoredAt:NSZeroPoint])) { 62 anchoredAt:NSZeroPoint])) {
61 bookmarkBubbleObserver_ = bubbleObserver; 63 bookmarkBubbleObserver_ = bubbleObserver;
62 managedBookmarkService_ = managed; 64 managedBookmarkService_ = managed;
63 model_ = model; 65 model_ = model;
64 node_ = node; 66 node_ = node;
65 alreadyBookmarked_ = alreadyBookmarked; 67 alreadyBookmarked_ = alreadyBookmarked;
68 BrowserWindowController* controller =
69 [[self parentWindow] windowController];
70 decoration_ = [[controller toolbarController] bookmarkDecoration];
66 } 71 }
67 return self; 72 return self;
68 } 73 }
69 74
70 - (void)awakeFromNib { 75 - (void)awakeFromNib {
71 [super awakeFromNib]; 76 [super awakeFromNib];
72 77
73 [[nameTextField_ cell] setUsesSingleLineMode:YES]; 78 [[nameTextField_ cell] setUsesSingleLineMode:YES];
74 79
75 Browser* browser = chrome::FindBrowserWithWindow(self.parentWindow); 80 Browser* browser = chrome::FindBrowserWithWindow(self.parentWindow);
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 bookmarkObserver_.reset(new BookmarkModelObserverForCocoa(model_, ^() { 177 bookmarkObserver_.reset(new BookmarkModelObserverForCocoa(model_, ^() {
173 [self dismissWithoutEditing:nil]; 178 [self dismissWithoutEditing:nil];
174 })); 179 }));
175 bookmarkObserver_->StartObservingNode(node_); 180 bookmarkObserver_->StartObservingNode(node_);
176 181
177 [parentWindow addChildWindow:window ordered:NSWindowAbove]; 182 [parentWindow addChildWindow:window ordered:NSWindowAbove];
178 [window makeKeyAndOrderFront:self]; 183 [window makeKeyAndOrderFront:self];
179 [self registerKeyStateEventTap]; 184 [self registerKeyStateEventTap];
180 185
181 bookmarkBubbleObserver_->OnBookmarkBubbleShown(node_); 186 bookmarkBubbleObserver_->OnBookmarkBubbleShown(node_);
187
188 [self decorationForBubble]->SetActive(true);
182 } 189 }
183 190
184 - (void)close { 191 - (void)close {
185 [[BrowserWindowController browserWindowControllerForWindow:self.parentWindow] 192 [[BrowserWindowController browserWindowControllerForWindow:self.parentWindow]
186 releaseToolbarVisibilityForOwner:self 193 releaseToolbarVisibilityForOwner:self
187 withAnimation:YES]; 194 withAnimation:YES];
188 195
189 [super close]; 196 [super close];
190 } 197 }
191 198
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 NSMenuItem *item = [menu addItemWithTitle:title 307 NSMenuItem *item = [menu addItemWithTitle:title
301 action:NULL 308 action:NULL
302 keyEquivalent:@""]; 309 keyEquivalent:@""];
303 [item setRepresentedObject:[[self class] chooseAnotherFolderObject]]; 310 [item setRepresentedObject:[[self class] chooseAnotherFolderObject]];
304 // Finally, select the current parent. 311 // Finally, select the current parent.
305 NSValue* parentValue = [NSValue valueWithPointer:node_->parent()]; 312 NSValue* parentValue = [NSValue valueWithPointer:node_->parent()];
306 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue]; 313 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
307 [folderPopUpButton_ selectItemAtIndex:idx]; 314 [folderPopUpButton_ selectItemAtIndex:idx];
308 } 315 }
309 316
317 - (LocationBarDecoration*)decorationForBubble {
318 return decoration_;
319 }
320
310 @end // BookmarkBubbleController 321 @end // BookmarkBubbleController
311 322
312 323
313 @implementation BookmarkBubbleController (ExposedForUnitTesting) 324 @implementation BookmarkBubbleController (ExposedForUnitTesting)
314 325
315 - (NSView*)syncPromoPlaceholder { 326 - (NSView*)syncPromoPlaceholder {
316 return syncPromoPlaceholder_; 327 return syncPromoPlaceholder_;
317 } 328 }
318 329
319 - (bookmarks::BookmarkBubbleObserver*)bookmarkBubbleObserver { 330 - (bookmarks::BookmarkBubbleObserver*)bookmarkBubbleObserver {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue]; 377 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
367 DCHECK(idx != -1); 378 DCHECK(idx != -1);
368 [folderPopUpButton_ selectItemAtIndex:idx]; 379 [folderPopUpButton_ selectItemAtIndex:idx];
369 } 380 }
370 381
371 - (NSPopUpButton*)folderPopUpButton { 382 - (NSPopUpButton*)folderPopUpButton {
372 return folderPopUpButton_; 383 return folderPopUpButton_;
373 } 384 }
374 385
375 @end // implementation BookmarkBubbleController(ExposedForUnitTesting) 386 @end // implementation BookmarkBubbleController(ExposedForUnitTesting)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698