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" | 10 #include "base/mac/mac_util.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" | 42 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" |
43 #include "chrome/browser/ui/cocoa/task_manager_mac.h" | 43 #include "chrome/browser/ui/cocoa/task_manager_mac.h" |
44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
45 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" | 45 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" |
46 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h" | 46 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h" |
47 #include "chrome/browser/ui/search/search_model.h" | 47 #include "chrome/browser/ui/search/search_model.h" |
48 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 48 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
49 #include "chrome/browser/web_applications/web_app.h" | 49 #include "chrome/browser/web_applications/web_app.h" |
50 #include "chrome/common/chrome_switches.h" | 50 #include "chrome/common/chrome_switches.h" |
51 #include "chrome/common/pref_names.h" | 51 #include "chrome/common/pref_names.h" |
| 52 #include "components/bookmarks/bookmark_pref_names.h" |
52 #include "components/autofill/core/common/password_form.h" | 53 #include "components/autofill/core/common/password_form.h" |
53 #include "content/public/browser/native_web_keyboard_event.h" | 54 #include "content/public/browser/native_web_keyboard_event.h" |
54 #include "content/public/browser/notification_details.h" | 55 #include "content/public/browser/notification_details.h" |
55 #include "content/public/browser/notification_source.h" | 56 #include "content/public/browser/notification_source.h" |
56 #include "content/public/browser/web_contents.h" | 57 #include "content/public/browser/web_contents.h" |
57 #include "content/public/browser/web_contents_view.h" | 58 #include "content/public/browser/web_contents_view.h" |
58 #include "grit/chromium_strings.h" | 59 #include "grit/chromium_strings.h" |
59 #include "grit/generated_resources.h" | 60 #include "grit/generated_resources.h" |
60 #include "ui/base/l10n/l10n_util_mac.h" | 61 #include "ui/base/l10n/l10n_util_mac.h" |
61 #include "ui/gfx/rect.h" | 62 #include "ui/gfx/rect.h" |
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
748 | 749 |
749 void BrowserWindowCocoa::ShowPageActionPopup( | 750 void BrowserWindowCocoa::ShowPageActionPopup( |
750 const extensions::Extension* extension) { | 751 const extensions::Extension* extension) { |
751 [cocoa_controller() activatePageAction:extension->id()]; | 752 [cocoa_controller() activatePageAction:extension->id()]; |
752 } | 753 } |
753 | 754 |
754 void BrowserWindowCocoa::ShowBrowserActionPopup( | 755 void BrowserWindowCocoa::ShowBrowserActionPopup( |
755 const extensions::Extension* extension) { | 756 const extensions::Extension* extension) { |
756 [cocoa_controller() activateBrowserAction:extension->id()]; | 757 [cocoa_controller() activateBrowserAction:extension->id()]; |
757 } | 758 } |
OLD | NEW |