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

Side by Side Diff: chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc

Issue 53703002: Remove IDR_BUBBLE_SHADOW, use IDR_WINDOW_BUBBLE_SHADOW_BIG. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove IDR_BUBBLE_SHADOW, use IDR_WINDOW_BUBBLE_SHADOW_BIG. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/views/fullscreen_exit_bubble_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/fullscreen/fullscreen_exit_bubble.h" 5 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_commands.h" 11 #include "chrome/browser/ui/browser_commands.h"
12 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" 12 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "grit/ui_strings.h" 14 #include "grit/ui_strings.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/gfx/rect.h" 16 #include "ui/gfx/rect.h"
17 17
18 // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding 18 // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
19 // here. 19 // here.
20 #if defined(OS_LINUX) 20 #if defined(OS_LINUX)
21 const int FullscreenExitBubble::kPaddingPx = 8; 21 const int FullscreenExitBubble::kPaddingPx = 8;
22 #else 22 #else
23 const int FullscreenExitBubble::kPaddingPx = 0; 23 const int FullscreenExitBubble::kPaddingPx = 15;
24 #endif 24 #endif
25 const int FullscreenExitBubble::kInitialDelayMs = 3800; 25 const int FullscreenExitBubble::kInitialDelayMs = 3800;
26 const int FullscreenExitBubble::kIdleTimeMs = 2300; 26 const int FullscreenExitBubble::kIdleTimeMs = 2300;
27 const int FullscreenExitBubble::kPositionCheckHz = 10; 27 const int FullscreenExitBubble::kPositionCheckHz = 10;
28 const int FullscreenExitBubble::kSlideInRegionHeightPx = 4; 28 const int FullscreenExitBubble::kSlideInRegionHeightPx = 4;
29 const int FullscreenExitBubble::kSlideInDurationMs = 350; 29 const int FullscreenExitBubble::kSlideInDurationMs = 350;
30 const int FullscreenExitBubble::kSlideOutDurationMs = 700; 30 const int FullscreenExitBubble::kSlideOutDurationMs = 700;
31 const int FullscreenExitBubble::kPopupTopPx = 15; 31 const int FullscreenExitBubble::kPopupTopPx = 15;
32 32
33 FullscreenExitBubble::FullscreenExitBubble(Browser* browser, 33 FullscreenExitBubble::FullscreenExitBubble(Browser* browser,
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } 138 }
139 139
140 string16 FullscreenExitBubble::GetAllowButtonText() const { 140 string16 FullscreenExitBubble::GetAllowButtonText() const {
141 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW); 141 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW);
142 } 142 }
143 143
144 string16 FullscreenExitBubble::GetInstructionText() const { 144 string16 FullscreenExitBubble::GetInstructionText() const {
145 return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT, 145 return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,
146 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY)); 146 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));
147 } 147 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/fullscreen_exit_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698