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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.mm

Issue 10383239: Move NativeWebKeyboardEvent to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 7 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 | Annotate | Revision Log
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 #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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "content/public/browser/web_contents.h" 44 #include "content/public/browser/web_contents.h"
45 #include "grit/chromium_strings.h" 45 #include "grit/chromium_strings.h"
46 #include "grit/generated_resources.h" 46 #include "grit/generated_resources.h"
47 #include "ui/base/l10n/l10n_util_mac.h" 47 #include "ui/base/l10n/l10n_util_mac.h"
48 #include "ui/gfx/rect.h" 48 #include "ui/gfx/rect.h"
49 49
50 #if defined(ENABLE_ONE_CLICK_SIGNIN) 50 #if defined(ENABLE_ONE_CLICK_SIGNIN)
51 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h" 51 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h"
52 #endif 52 #endif
53 53
54 using content::NativeWebKeyboardEvent;
54 using content::SSLStatus; 55 using content::SSLStatus;
55 using content::WebContents; 56 using content::WebContents;
56 57
57 // Replicate specific 10.7 SDK declarations for building with prior SDKs. 58 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
58 #if !defined(MAC_OS_X_VERSION_10_7) || \ 59 #if !defined(MAC_OS_X_VERSION_10_7) || \
59 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 60 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
60 61
61 enum { 62 enum {
62 NSWindowAnimationBehaviorDefault = 0, 63 NSWindowAnimationBehaviorDefault = 0,
63 NSWindowAnimationBehaviorNone = 2, 64 NSWindowAnimationBehaviorNone = 2,
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 AvatarMenuBubbleController* menu = 661 AvatarMenuBubbleController* menu =
661 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ 662 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_
662 anchoredAt:point]; 663 anchoredAt:point];
663 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; 664 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
664 [menu showWindow:nil]; 665 [menu showWindow:nil];
665 } 666 }
666 667
667 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { 668 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() {
668 [[controller_ avatarButtonController] showAvatarBubble]; 669 [[controller_ avatarButtonController] showAvatarBubble];
669 } 670 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.h ('k') | chrome/browser/ui/cocoa/browser_window_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698