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

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

Issue 1419993010: chrome: Rename WrenchMenuController to AppMenuController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 5 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
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/global_error_bubble_controller.h" 5 #import "chrome/browser/ui/cocoa/global_error_bubble_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #import "chrome/browser/ui/browser.h" 12 #import "chrome/browser/ui/browser.h"
13 #import "chrome/browser/ui/browser_window.h" 13 #import "chrome/browser/ui/browser_window.h"
14 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
14 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 15 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
15 #import "chrome/browser/ui/cocoa/info_bubble_view.h" 16 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
16 #import "chrome/browser/ui/cocoa/l10n_util.h" 17 #import "chrome/browser/ui/cocoa/l10n_util.h"
17 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
18 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
19 #include "chrome/browser/ui/global_error/global_error.h" 19 #include "chrome/browser/ui/global_error/global_error.h"
20 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" 20 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
21 #include "chrome/browser/ui/global_error/global_error_service.h" 21 #include "chrome/browser/ui/global_error/global_error_service.h"
22 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 22 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
23 #include "components/search_engines/util.h" 23 #include "components/search_engines/util.h"
24 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h" 24 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/gfx/image/image.h" 26 #include "ui/gfx/image/image.h"
27 27
28 namespace { 28 namespace {
(...skipping 19 matching lines...) Expand all
48 @implementation GlobalErrorBubbleController 48 @implementation GlobalErrorBubbleController
49 49
50 + (GlobalErrorBubbleViewBase*)showForBrowser:(Browser*)browser 50 + (GlobalErrorBubbleViewBase*)showForBrowser:(Browser*)browser
51 error:(const base::WeakPtr<GlobalErrorWithStandardBubble>&)error { 51 error:(const base::WeakPtr<GlobalErrorWithStandardBubble>&)error {
52 NSWindow* parentWindow = browser->window()->GetNativeWindow(); 52 NSWindow* parentWindow = browser->window()->GetNativeWindow();
53 BrowserWindowController* bwc = [BrowserWindowController 53 BrowserWindowController* bwc = [BrowserWindowController
54 browserWindowControllerForWindow:parentWindow]; 54 browserWindowControllerForWindow:parentWindow];
55 NSView* wrenchButton = [[bwc toolbarController] wrenchButton]; 55 NSView* wrenchButton = [[bwc toolbarController] wrenchButton];
56 NSPoint offset = NSMakePoint( 56 NSPoint offset = NSMakePoint(
57 NSMidX([wrenchButton bounds]), 57 NSMidX([wrenchButton bounds]),
58 wrench_menu_controller::kWrenchBubblePointOffsetY); 58 app_menu_controller::kAppMenuBubblePointOffsetY);
59 59
60 // The bubble will be automatically deleted when the window is closed. 60 // The bubble will be automatically deleted when the window is closed.
61 GlobalErrorBubbleController* bubble = [[GlobalErrorBubbleController alloc] 61 GlobalErrorBubbleController* bubble = [[GlobalErrorBubbleController alloc]
62 initWithWindowNibPath:@"GlobalErrorBubble" 62 initWithWindowNibPath:@"GlobalErrorBubble"
63 relativeToView:wrenchButton 63 relativeToView:wrenchButton
64 offset:offset]; 64 offset:offset];
65 bubble->error_ = error; 65 bubble->error_ = error;
66 bubble->bridge_.reset(new GlobalErrorBubbleControllerInternal::Bridge( 66 bubble->bridge_.reset(new GlobalErrorBubbleControllerInternal::Bridge(
67 bubble)); 67 bubble));
68 bubble->browser_ = browser; 68 bubble->browser_ = browser;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 [self close]; 153 [self close];
154 } 154 }
155 155
156 @end 156 @end
157 157
158 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView( 158 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView(
159 Browser* browser, 159 Browser* browser,
160 const base::WeakPtr<GlobalErrorWithStandardBubble>& error) { 160 const base::WeakPtr<GlobalErrorWithStandardBubble>& error) {
161 return [GlobalErrorBubbleController showForBrowser:browser error:error]; 161 return [GlobalErrorBubbleController showForBrowser:browser error:error];
162 } 162 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698