| OLD | NEW |
| 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 "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/mac/mac_util.h" | |
| 11 #import "base/mac/sdk_forward_declarations.h" | 10 #import "base/mac/sdk_forward_declarations.h" |
| 12 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 13 #include "base/prefs/pref_service.h" | 12 #include "base/prefs/pref_service.h" |
| 14 #include "base/strings/sys_string_conversions.h" | 13 #include "base/strings/sys_string_conversions.h" |
| 15 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
| 16 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
| 17 #include "chrome/browser/download/download_shelf.h" | 16 #include "chrome/browser/download/download_shelf.h" |
| 18 #include "chrome/browser/extensions/bookmark_app_helper.h" | 17 #include "chrome/browser/extensions/bookmark_app_helper.h" |
| 19 #include "chrome/browser/extensions/extension_service.h" | 18 #include "chrome/browser/extensions/extension_service.h" |
| 20 #include "chrome/browser/extensions/launch_util.h" | 19 #include "chrome/browser/extensions/launch_util.h" |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 785 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) | 784 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) |
| 786 return 0; | 785 return 0; |
| 787 return 40; | 786 return 40; |
| 788 } | 787 } |
| 789 | 788 |
| 790 void BrowserWindowCocoa::ExecuteExtensionCommand( | 789 void BrowserWindowCocoa::ExecuteExtensionCommand( |
| 791 const extensions::Extension* extension, | 790 const extensions::Extension* extension, |
| 792 const extensions::Command& command) { | 791 const extensions::Command& command) { |
| 793 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; | 792 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; |
| 794 } | 793 } |
| OLD | NEW |