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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 49 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
50 #include "chrome/browser/web_applications/web_app.h" | 50 #include "chrome/browser/web_applications/web_app.h" |
51 #include "chrome/common/chrome_switches.h" | 51 #include "chrome/common/chrome_switches.h" |
52 #include "chrome/common/pref_names.h" | 52 #include "chrome/common/pref_names.h" |
53 #include "components/autofill/core/common/password_form.h" | 53 #include "components/autofill/core/common/password_form.h" |
54 #include "components/translate/core/browser/language_state.h" | 54 #include "components/translate/core/browser/language_state.h" |
55 #include "content/public/browser/native_web_keyboard_event.h" | 55 #include "content/public/browser/native_web_keyboard_event.h" |
56 #include "content/public/browser/notification_details.h" | 56 #include "content/public/browser/notification_details.h" |
57 #include "content/public/browser/notification_source.h" | 57 #include "content/public/browser/notification_source.h" |
58 #include "content/public/browser/web_contents.h" | 58 #include "content/public/browser/web_contents.h" |
59 #include "grit/chromium_strings.h" | |
60 #include "grit/generated_resources.h" | |
61 #include "ui/base/l10n/l10n_util_mac.h" | 59 #include "ui/base/l10n/l10n_util_mac.h" |
62 #include "ui/gfx/rect.h" | 60 #include "ui/gfx/rect.h" |
63 | 61 |
64 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 62 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
65 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h" | 63 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h" |
66 #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h" | 64 #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h" |
67 #endif | 65 #endif |
68 | 66 |
69 using content::NativeWebKeyboardEvent; | 67 using content::NativeWebKeyboardEvent; |
70 using content::SSLStatus; | 68 using content::SSLStatus; |
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
760 | 758 |
761 void BrowserWindowCocoa::ShowPageActionPopup( | 759 void BrowserWindowCocoa::ShowPageActionPopup( |
762 const extensions::Extension* extension) { | 760 const extensions::Extension* extension) { |
763 [cocoa_controller() activatePageAction:extension->id()]; | 761 [cocoa_controller() activatePageAction:extension->id()]; |
764 } | 762 } |
765 | 763 |
766 void BrowserWindowCocoa::ShowBrowserActionPopup( | 764 void BrowserWindowCocoa::ShowBrowserActionPopup( |
767 const extensions::Extension* extension) { | 765 const extensions::Extension* extension) { |
768 [cocoa_controller() activateBrowserAction:extension->id()]; | 766 [cocoa_controller() activateBrowserAction:extension->id()]; |
769 } | 767 } |
OLD | NEW |