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

Side by Side Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 401523002: Move media related mimetype functionality out of net/ and into media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add content/common/mime_util.h for realz Created 6 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
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/views/tabs/browser_tab_strip_controller.h" 5 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/task_runner_util.h" 9 #include "base/task_runner_util.h"
10 #include "base/threading/sequenced_worker_pool.h" 10 #include "base/threading/sequenced_worker_pool.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/ui/tabs/tab_strip_model.h" 23 #include "chrome/browser/ui/tabs/tab_strip_model.h"
24 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 24 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
25 #include "chrome/browser/ui/tabs/tab_utils.h" 25 #include "chrome/browser/ui/tabs/tab_utils.h"
26 #include "chrome/browser/ui/views/frame/browser_view.h" 26 #include "chrome/browser/ui/views/frame/browser_view.h"
27 #include "chrome/browser/ui/views/tabs/tab.h" 27 #include "chrome/browser/ui/views/tabs/tab.h"
28 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h" 28 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
29 #include "chrome/browser/ui/views/tabs/tab_strip.h" 29 #include "chrome/browser/ui/views/tabs/tab_strip.h"
30 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
31 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
32 #include "components/metrics/proto/omnibox_event.pb.h" 32 #include "components/metrics/proto/omnibox_event.pb.h"
33 #include "content/common/mime_util.h"
33 #include "content/public/browser/browser_thread.h" 34 #include "content/public/browser/browser_thread.h"
34 #include "content/public/browser/notification_service.h" 35 #include "content/public/browser/notification_service.h"
35 #include "content/public/browser/plugin_service.h" 36 #include "content/public/browser/plugin_service.h"
36 #include "content/public/browser/user_metrics.h" 37 #include "content/public/browser/user_metrics.h"
37 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
38 #include "content/public/common/webplugininfo.h" 39 #include "content/public/common/webplugininfo.h"
39 #include "ipc/ipc_message.h" 40 #include "ipc/ipc_message.h"
40 #include "net/base/filename_util.h" 41 #include "net/base/filename_util.h"
41 #include "ui/base/models/list_selection_model.h" 42 #include "ui/base/models/list_selection_model.h"
42 #include "ui/gfx/image/image.h" 43 #include "ui/gfx/image/image.h"
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 const GURL& url, 572 const GURL& url,
572 const std::string& mime_type) { 573 const std::string& mime_type) {
573 // Check whether the mime type, if given, is known to be supported or whether 574 // Check whether the mime type, if given, is known to be supported or whether
574 // there is a plugin that supports the mime type (e.g. PDF). 575 // there is a plugin that supports the mime type (e.g. PDF).
575 // TODO(bauerb): This possibly uses stale information, but it's guaranteed not 576 // TODO(bauerb): This possibly uses stale information, but it's guaranteed not
576 // to do disk access. 577 // to do disk access.
577 content::WebPluginInfo plugin; 578 content::WebPluginInfo plugin;
578 tabstrip_->FileSupported( 579 tabstrip_->FileSupported(
579 url, 580 url,
580 mime_type.empty() || 581 mime_type.empty() ||
581 net::IsSupportedMimeType(mime_type) || 582 content::IsSupportedMimeType(mime_type) ||
582 content::PluginService::GetInstance()->GetPluginInfo( 583 content::PluginService::GetInstance()->GetPluginInfo(
583 -1, // process ID 584 -1, // process ID
584 MSG_ROUTING_NONE, // routing ID 585 MSG_ROUTING_NONE, // routing ID
585 model_->profile()->GetResourceContext(), 586 model_->profile()->GetResourceContext(),
586 url, GURL(), mime_type, false, 587 url, GURL(), mime_type, false,
587 NULL, &plugin, NULL)); 588 NULL, &plugin, NULL));
588 } 589 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698