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

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

Issue 1543803005: Added an integration test for kasko hang reports (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Set executable bit for python scripts Created 4 years, 10 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 | « chrome/app/main_dll_loader_win.cc ('k') | chrome/chrome_watcher/chrome_watcher_main.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/extensions/extension_tab_util.h" 5 #include "chrome/browser/extensions/extension_tab_util.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 GURL url = GURL(url_string); 557 GURL url = GURL(url_string);
558 if (!url.is_valid()) 558 if (!url.is_valid())
559 url = extension->GetResourceURL(url_string); 559 url = extension->GetResourceURL(url_string);
560 560
561 return url; 561 return url;
562 } 562 }
563 563
564 bool ExtensionTabUtil::IsKillURL(const GURL& url) { 564 bool ExtensionTabUtil::IsKillURL(const GURL& url) {
565 static const char* kill_hosts[] = { 565 static const char* kill_hosts[] = {
566 chrome::kChromeUICrashHost, 566 chrome::kChromeUICrashHost,
567 chrome::kChromeUIDelayedHangUIHost,
567 chrome::kChromeUIHangUIHost, 568 chrome::kChromeUIHangUIHost,
568 chrome::kChromeUIKillHost, 569 chrome::kChromeUIKillHost,
569 chrome::kChromeUIQuitHost, 570 chrome::kChromeUIQuitHost,
570 chrome::kChromeUIRestartHost, 571 chrome::kChromeUIRestartHost,
571 content::kChromeUIBrowserCrashHost, 572 content::kChromeUIBrowserCrashHost,
572 }; 573 };
573 574
574 // Check a fixed-up URL, to normalize the scheme and parse hosts correctly. 575 // Check a fixed-up URL, to normalize the scheme and parse hosts correctly.
575 GURL fixed_url = 576 GURL fixed_url =
576 url_formatter::FixupURL(url.possibly_invalid_spec(), std::string()); 577 url_formatter::FixupURL(url.possibly_invalid_spec(), std::string());
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 chrome::ShowSingletonTabOverwritingNTP(browser, params); 674 chrome::ShowSingletonTabOverwritingNTP(browser, params);
674 return true; 675 return true;
675 } 676 }
676 677
677 // static 678 // static
678 bool ExtensionTabUtil::BrowserSupportsTabs(Browser* browser) { 679 bool ExtensionTabUtil::BrowserSupportsTabs(Browser* browser) {
679 return browser && browser->tab_strip_model() && !browser->is_devtools(); 680 return browser && browser->tab_strip_model() && !browser->is_devtools();
680 } 681 }
681 682
682 } // namespace extensions 683 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/app/main_dll_loader_win.cc ('k') | chrome/chrome_watcher/chrome_watcher_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698