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

Side by Side Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 2756133003: Stable channel test failures due to r452240 (Closed)
Patch Set: -- Created 3 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_browsertest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/chrome_extensions_browser_client.h" 5 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "extensions/browser/updater/null_extension_cache.h" 68 #include "extensions/browser/updater/null_extension_cache.h"
69 #endif 69 #endif
70 70
71 namespace extensions { 71 namespace extensions {
72 72
73 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() { 73 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {
74 process_manager_delegate_.reset(new ChromeProcessManagerDelegate); 74 process_manager_delegate_.reset(new ChromeProcessManagerDelegate);
75 api_client_.reset(new ChromeExtensionsAPIClient); 75 api_client_.reset(new ChromeExtensionsAPIClient);
76 // Only set if it hasn't already been set (e.g. by a test). 76 // Only set if it hasn't already been set (e.g. by a test).
77 if (GetCurrentChannel() == GetDefaultChannel()) 77 if (GetCurrentChannel() == GetDefaultChannel())
78 SetCurrentChannel(chrome::GetChannel()); 78 SetCurrentChannel(version_info::Channel::STABLE);
79 resource_manager_.reset(new ChromeComponentExtensionResourceManager()); 79 resource_manager_.reset(new ChromeComponentExtensionResourceManager());
80 } 80 }
81 81
82 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {} 82 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {}
83 83
84 bool ChromeExtensionsBrowserClient::IsShuttingDown() { 84 bool ChromeExtensionsBrowserClient::IsShuttingDown() {
85 return g_browser_process->IsShuttingDown(); 85 return g_browser_process->IsShuttingDown();
86 } 86 }
87 87
88 bool ChromeExtensionsBrowserClient::AreExtensionsDisabled( 88 bool ChromeExtensionsBrowserClient::AreExtensionsDisabled(
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 return navigation_data->GetExtensionNavigationUIData(); 434 return navigation_data->GetExtensionNavigationUIData();
435 } 435 }
436 436
437 KioskDelegate* ChromeExtensionsBrowserClient::GetKioskDelegate() { 437 KioskDelegate* ChromeExtensionsBrowserClient::GetKioskDelegate() {
438 if (!kiosk_delegate_) 438 if (!kiosk_delegate_)
439 kiosk_delegate_.reset(new ChromeKioskDelegate()); 439 kiosk_delegate_.reset(new ChromeKioskDelegate());
440 return kiosk_delegate_.get(); 440 return kiosk_delegate_.get();
441 } 441 }
442 442
443 } // namespace extensions 443 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698