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

Side by Side Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/website_settings/permission_bubble_controller.h " 5 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h "
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/mac/bind_objc_block.h" 9 #include "base/mac/bind_objc_block.h"
10 #include "base/mac/foundation_util.h" 10 #include "base/mac/foundation_util.h"
(...skipping 10 matching lines...) Expand all
21 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" 21 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
22 #import "chrome/browser/ui/cocoa/info_bubble_view.h" 22 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
23 #import "chrome/browser/ui/cocoa/info_bubble_window.h" 23 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
24 #include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h" 24 #include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
25 #include "chrome/browser/ui/cocoa/website_settings/permission_selector_button.h" 25 #include "chrome/browser/ui/cocoa/website_settings/permission_selector_button.h"
26 #include "chrome/browser/ui/cocoa/website_settings/split_block_button.h" 26 #include "chrome/browser/ui/cocoa/website_settings/split_block_button.h"
27 #include "chrome/browser/ui/cocoa/website_settings/website_settings_utils_cocoa. h" 27 #include "chrome/browser/ui/cocoa/website_settings/website_settings_utils_cocoa. h"
28 #include "chrome/browser/ui/website_settings/permission_bubble_request.h" 28 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
29 #include "chrome/browser/ui/website_settings/permission_bubble_view.h" 29 #include "chrome/browser/ui/website_settings/permission_bubble_view.h"
30 #include "chrome/browser/ui/website_settings/permission_menu_model.h" 30 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
31 #include "chrome/grit/generated_resources.h"
31 #include "content/public/browser/native_web_keyboard_event.h" 32 #include "content/public/browser/native_web_keyboard_event.h"
32 #include "content/public/browser/user_metrics.h" 33 #include "content/public/browser/user_metrics.h"
33 #include "grit/generated_resources.h"
34 #include "skia/ext/skia_utils_mac.h" 34 #include "skia/ext/skia_utils_mac.h"
35 #import "ui/base/cocoa/menu_controller.h" 35 #import "ui/base/cocoa/menu_controller.h"
36 #include "ui/base/cocoa/window_size_constants.h" 36 #include "ui/base/cocoa/window_size_constants.h"
37 #import "ui/base/cocoa/menu_controller.h"
38 #include "ui/base/l10n/l10n_util_mac.h" 37 #include "ui/base/l10n/l10n_util_mac.h"
39 #include "ui/base/models/simple_menu_model.h" 38 #include "ui/base/models/simple_menu_model.h"
40 39
41 using base::UserMetricsAction; 40 using base::UserMetricsAction;
42 41
43 namespace { 42 namespace {
44 43
45 const CGFloat kHorizontalPadding = 13.0f; 44 const CGFloat kHorizontalPadding = 13.0f;
46 const CGFloat kVerticalPadding = 13.0f; 45 const CGFloat kVerticalPadding = 13.0f;
47 const CGFloat kBetweenButtonsPadding = 10.0f; 46 const CGFloat kBetweenButtonsPadding = 10.0f;
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 595
597 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB { 596 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB {
598 NSRect frameA = [viewA frame]; 597 NSRect frameA = [viewA frame];
599 NSRect frameB = [viewB frame]; 598 NSRect frameB = [viewB frame];
600 frameA.origin.y = 599 frameA.origin.y =
601 NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2); 600 NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2);
602 [viewA setFrameOrigin:frameA.origin]; 601 [viewA setFrameOrigin:frameA.origin];
603 } 602 }
604 603
605 @end // implementation PermissionBubbleController 604 @end // implementation PermissionBubbleController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698