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

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

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thestig@'s comments. Created 6 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 #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 "chrome/grit/generated_resources.h" 13 #include "chrome/grit/generated_resources.h"
14 #include "extensions/browser/extension_system.h" 14 #include "extensions/browser/extension_registry.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 #include "ui/strings/grit/ui_strings.h" 17 #include "ui/strings/grit/ui_strings.h"
18 18
19 // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding 19 // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
20 // here. 20 // here.
21 #if defined(OS_LINUX) 21 #if defined(OS_LINUX)
22 const int FullscreenExitBubble::kPaddingPx = 8; 22 const int FullscreenExitBubble::kPaddingPx = 8;
23 #else 23 #else
24 const int FullscreenExitBubble::kPaddingPx = 15; 24 const int FullscreenExitBubble::kPaddingPx = 15;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 browser_->fullscreen_controller()->OnAcceptFullscreenPermission(); 125 browser_->fullscreen_controller()->OnAcceptFullscreenPermission();
126 } 126 }
127 127
128 void FullscreenExitBubble::Cancel() { 128 void FullscreenExitBubble::Cancel() {
129 browser_->fullscreen_controller()->OnDenyFullscreenPermission(); 129 browser_->fullscreen_controller()->OnDenyFullscreenPermission();
130 } 130 }
131 131
132 base::string16 FullscreenExitBubble::GetCurrentMessageText() const { 132 base::string16 FullscreenExitBubble::GetCurrentMessageText() const {
133 return fullscreen_bubble::GetLabelTextForType( 133 return fullscreen_bubble::GetLabelTextForType(
134 bubble_type_, url_, 134 bubble_type_, url_,
135 extensions::ExtensionSystem::Get( 135 extensions::ExtensionRegistry::Get(browser_->profile()));
136 browser_->profile())->extension_service());
137 } 136 }
138 137
139 base::string16 FullscreenExitBubble::GetCurrentDenyButtonText() const { 138 base::string16 FullscreenExitBubble::GetCurrentDenyButtonText() const {
140 return fullscreen_bubble::GetDenyButtonTextForType(bubble_type_); 139 return fullscreen_bubble::GetDenyButtonTextForType(bubble_type_);
141 } 140 }
142 141
143 base::string16 FullscreenExitBubble::GetAllowButtonText() const { 142 base::string16 FullscreenExitBubble::GetAllowButtonText() const {
144 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW); 143 return l10n_util::GetStringUTF16(IDS_FULLSCREEN_ALLOW);
145 } 144 }
146 145
147 base::string16 FullscreenExitBubble::GetInstructionText() const { 146 base::string16 FullscreenExitBubble::GetInstructionText() const {
148 return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT, 147 return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,
149 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY)); 148 l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));
150 } 149 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698