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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 657443004: MacViews: Get views based toolbar to compile on the Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@views-findbar
Patch Set: Rebase Created 6 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
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_controller.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_view.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) 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/toolbar/toolbar_controller.h" 5 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/ui/cocoa/drag_util.h" 28 #include "chrome/browser/ui/cocoa/drag_util.h"
29 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 29 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
30 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" 30 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
31 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 31 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
32 #import "chrome/browser/ui/cocoa/gradient_button_cell.h" 32 #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
33 #import "chrome/browser/ui/cocoa/image_button_cell.h" 33 #import "chrome/browser/ui/cocoa/image_button_cell.h"
34 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" 34 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
35 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 35 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
36 #import "chrome/browser/ui/cocoa/menu_button.h" 36 #import "chrome/browser/ui/cocoa/menu_button.h"
37 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h" 37 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"
38 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h" 38 #import "chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.h"
39 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h" 39 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h"
40 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h" 40 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.h"
41 #import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h" 41 #import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h"
42 #import "chrome/browser/ui/cocoa/view_id_util.h" 42 #import "chrome/browser/ui/cocoa/view_id_util.h"
43 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 43 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
44 #include "chrome/browser/ui/omnibox/omnibox_view.h" 44 #include "chrome/browser/ui/omnibox/omnibox_view.h"
45 #include "chrome/browser/ui/tabs/tab_strip_model.h" 45 #include "chrome/browser/ui/tabs/tab_strip_model.h"
46 #include "chrome/browser/ui/toolbar/wrench_menu_badge_controller.h" 46 #include "chrome/browser/ui/toolbar/wrench_menu_badge_controller.h"
47 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 47 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
48 #include "chrome/common/pref_names.h" 48 #include "chrome/common/pref_names.h"
49 #include "chrome/grit/chromium_strings.h" 49 #include "chrome/grit/chromium_strings.h"
50 #include "chrome/grit/generated_resources.h" 50 #include "chrome/grit/generated_resources.h"
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 - (void)hideDropURLsIndicatorInView:(NSView*)view { 830 - (void)hideDropURLsIndicatorInView:(NSView*)view {
831 // Do nothing. 831 // Do nothing.
832 } 832 }
833 833
834 // (URLDropTargetController protocol) 834 // (URLDropTargetController protocol)
835 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { 835 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
836 return drag_util::IsUnsupportedDropData(profile_, info); 836 return drag_util::IsUnsupportedDropData(profile_, info);
837 } 837 }
838 838
839 @end 839 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_controller.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698