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

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

Issue 2110983002: [Mac] Refactor Cocoa fullscreen code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 years, 5 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 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #import "base/mac/bundle_locations.h" 9 #import "base/mac/bundle_locations.h"
10 #import "base/mac/foundation_util.h" 10 #import "base/mac/foundation_util.h"
(...skipping 23 matching lines...) Expand all
34 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" 34 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
35 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" 35 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
36 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h" 36 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h"
37 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" 37 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
38 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" 38 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
39 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" 39 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
40 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" 40 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
41 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" 41 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
42 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 42 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
43 #import "chrome/browser/ui/cocoa/menu_button.h" 43 #import "chrome/browser/ui/cocoa/menu_button.h"
44 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" 44 #import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h"
Robert Sesek 2016/06/30 17:40:09 Is this unused in this file?
spqchan 2016/06/30 19:46:29 Good point. It was using kWillEnterFullscreenNotif
45 #import "chrome/browser/ui/cocoa/themed_window.h" 45 #import "chrome/browser/ui/cocoa/themed_window.h"
46 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 46 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
47 #import "chrome/browser/ui/cocoa/view_id_util.h" 47 #import "chrome/browser/ui/cocoa/view_id_util.h"
48 #import "chrome/browser/ui/cocoa/view_resizer.h" 48 #import "chrome/browser/ui/cocoa/view_resizer.h"
49 #include "chrome/browser/ui/tabs/tab_strip_model.h" 49 #include "chrome/browser/ui/tabs/tab_strip_model.h"
50 #include "chrome/common/extensions/extension_constants.h" 50 #include "chrome/common/extensions/extension_constants.h"
51 #include "chrome/common/extensions/extension_metrics.h" 51 #include "chrome/common/extensions/extension_metrics.h"
52 #include "chrome/common/url_constants.h" 52 #include "chrome/common/url_constants.h"
53 #include "chrome/grit/generated_resources.h" 53 #include "chrome/grit/generated_resources.h"
54 #include "components/bookmarks/browser/bookmark_model.h" 54 #include "components/bookmarks/browser/bookmark_model.h"
(...skipping 3040 matching lines...) Expand 10 before | Expand all | Expand 10 after
3095 - (id<BookmarkButtonControllerProtocol>)controllerForNode: 3095 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
3096 (const BookmarkNode*)node { 3096 (const BookmarkNode*)node {
3097 // See if it's in the bar, then if it is in the hierarchy of visible 3097 // See if it's in the bar, then if it is in the hierarchy of visible
3098 // folder menus. 3098 // folder menus.
3099 if (bookmarkModel_->bookmark_bar_node() == node) 3099 if (bookmarkModel_->bookmark_bar_node() == node)
3100 return self; 3100 return self;
3101 return [folderController_ controllerForNode:node]; 3101 return [folderController_ controllerForNode:node];
3102 } 3102 }
3103 3103
3104 @end 3104 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698