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

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

Issue 595283002: Move nsview_additions and hyperlink_text_view to ui/base/cocoa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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
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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/logging.h" // for NOTREACHED() 7 #include "base/logging.h" // for NOTREACHED()
8 #include "base/mac/bundle_locations.h" 8 #include "base/mac/bundle_locations.h"
9 #include "base/mac/mac_util.h" 9 #include "base/mac/mac_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 #include "chrome/app/chrome_command_ids.h" 12 #include "chrome/app/chrome_command_ids.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_commands.h" 15 #include "chrome/browser/ui/browser_commands.h"
16 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 16 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
17 #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h" 17 #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h"
18 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
19 #import "chrome/browser/ui/cocoa/info_bubble_view.h" 18 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
20 #import "chrome/browser/ui/cocoa/info_bubble_window.h" 19 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
21 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" 20 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
22 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" 21 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h"
23 #include "chrome/grit/generated_resources.h" 22 #include "chrome/grit/generated_resources.h"
24 #include "extensions/browser/extension_system.h" 23 #include "extensions/browser/extension_system.h"
25 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h " 24 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h "
26 #include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutT weaker.h" 25 #include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutT weaker.h"
27 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h" 26 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"
28 #include "ui/base/accelerators/platform_accelerator_cocoa.h" 27 #include "ui/base/accelerators/platform_accelerator_cocoa.h"
28 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
Dan Beam 2014/09/25 19:03:51 it seems this might've broken some print preview F
groby-ooo-7-16 2014/09/25 19:28:36 Yes - symbols you want available outside ui/base n
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/l10n/l10n_util_mac.h" 30 #include "ui/base/l10n/l10n_util_mac.h"
31 #include "ui/strings/grit/ui_strings.h" 31 #include "ui/strings/grit/ui_strings.h"
32 32
33 33
34 namespace { 34 namespace {
35 const float kInitialDelay = 3.8; 35 const float kInitialDelay = 3.8;
36 const float kHideDuration = 0.7; 36 const float kHideDuration = 0.7;
37 } // namespace 37 } // namespace
38 38
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 - (void)hideSoon { 317 - (void)hideSoon {
318 hideTimer_.reset( 318 hideTimer_.reset(
319 [[NSTimer scheduledTimerWithTimeInterval:kInitialDelay 319 [[NSTimer scheduledTimerWithTimeInterval:kInitialDelay
320 target:self 320 target:self
321 selector:@selector(hideTimerFired:) 321 selector:@selector(hideTimerFired:)
322 userInfo:nil 322 userInfo:nil
323 repeats:NO] retain]); 323 repeats:NO] retain]);
324 } 324 }
325 325
326 @end 326 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/framed_browser_window.mm ('k') | chrome/browser/ui/cocoa/gradient_button_cell.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698