chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc - Issue 10702030: Move fullscreen_controller* to a subdirectory

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10702030: Move fullscreen_controller* to a subdirectory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge tot Created 8 years, 5 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

OLD	NEW
1 // Copyright (c) 2011 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_exit_bubble.h"	5 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/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 "grit/generated_resources.h"	12 #include "grit/generated_resources.h"

13 #include "grit/ui_strings.h"	13 #include "grit/ui_strings.h"

14 #include "ui/base/l10n/l10n_util.h"	14 #include "ui/base/l10n/l10n_util.h"

15 #include "ui/gfx/rect.h"	15 #include "ui/gfx/rect.h"

(...skipping 114 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
130 }	130 }

131	131

132 string16 FullscreenExitBubble::GetAllowButtonText() const {	132 string16 FullscreenExitBubble::GetAllowButtonText() const {

133 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW);	133 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW);

134 }	134 }

135	135

136 string16 FullscreenExitBubble::GetInstructionText() const {	136 string16 FullscreenExitBubble::GetInstructionText() const {

137 return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,	137 return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,

138 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));	138 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));

139 }	139 }

OLD	NEW