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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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/macros.h" 8 #include "base/macros.h"
9 #include "base/prefs/pref_service.h"
10 #include "base/task_runner_util.h" 9 #include "base/task_runner_util.h"
11 #include "base/threading/sequenced_worker_pool.h" 10 #include "base/threading/sequenced_worker_pool.h"
12 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 11 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
13 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/extensions/tab_helper.h" 14 #include "chrome/browser/extensions/tab_helper.h"
16 #include "chrome/browser/favicon/favicon_utils.h" 15 #include "chrome/browser/favicon/favicon_utils.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/search/search.h" 17 #include "chrome/browser/search/search.h"
19 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
20 #include "chrome/browser/ui/browser_navigator_params.h" 19 #include "chrome/browser/ui/browser_navigator_params.h"
21 #include "chrome/browser/ui/browser_tabstrip.h" 20 #include "chrome/browser/ui/browser_tabstrip.h"
22 #include "chrome/browser/ui/tabs/tab_menu_model.h" 21 #include "chrome/browser/ui/tabs/tab_menu_model.h"
23 #include "chrome/browser/ui/tabs/tab_strip_model.h" 22 #include "chrome/browser/ui/tabs/tab_strip_model.h"
24 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 23 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
25 #include "chrome/browser/ui/tabs/tab_utils.h" 24 #include "chrome/browser/ui/tabs/tab_utils.h"
26 #include "chrome/browser/ui/views/frame/browser_view.h" 25 #include "chrome/browser/ui/views/frame/browser_view.h"
27 #include "chrome/browser/ui/views/tabs/tab.h" 26 #include "chrome/browser/ui/views/tabs/tab.h"
28 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h" 27 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
29 #include "chrome/browser/ui/views/tabs/tab_strip.h" 28 #include "chrome/browser/ui/views/tabs/tab_strip.h"
30 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
31 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
32 #include "components/favicon/content/content_favicon_driver.h" 31 #include "components/favicon/content/content_favicon_driver.h"
33 #include "components/metrics/proto/omnibox_event.pb.h" 32 #include "components/metrics/proto/omnibox_event.pb.h"
34 #include "components/mime_util/mime_util.h" 33 #include "components/mime_util/mime_util.h"
35 #include "components/omnibox/browser/autocomplete_classifier.h" 34 #include "components/omnibox/browser/autocomplete_classifier.h"
36 #include "components/omnibox/browser/autocomplete_match.h" 35 #include "components/omnibox/browser/autocomplete_match.h"
36 #include "components/prefs/pref_service.h"
37 #include "content/public/browser/browser_thread.h" 37 #include "content/public/browser/browser_thread.h"
38 #include "content/public/browser/notification_service.h" 38 #include "content/public/browser/notification_service.h"
39 #include "content/public/browser/plugin_service.h" 39 #include "content/public/browser/plugin_service.h"
40 #include "content/public/browser/user_metrics.h" 40 #include "content/public/browser/user_metrics.h"
41 #include "content/public/browser/web_contents.h" 41 #include "content/public/browser/web_contents.h"
42 #include "content/public/common/webplugininfo.h" 42 #include "content/public/common/webplugininfo.h"
43 #include "ipc/ipc_message.h" 43 #include "ipc/ipc_message.h"
44 #include "net/base/filename_util.h" 44 #include "net/base/filename_util.h"
45 #include "ui/base/models/list_selection_model.h" 45 #include "ui/base/models/list_selection_model.h"
46 #include "ui/gfx/image/image.h" 46 #include "ui/gfx/image/image.h"
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 content::WebPluginInfo plugin; 580 content::WebPluginInfo plugin;
581 tabstrip_->FileSupported( 581 tabstrip_->FileSupported(
582 url, 582 url,
583 mime_type.empty() || mime_util::IsSupportedMimeType(mime_type) || 583 mime_type.empty() || mime_util::IsSupportedMimeType(mime_type) ||
584 content::PluginService::GetInstance()->GetPluginInfo( 584 content::PluginService::GetInstance()->GetPluginInfo(
585 -1, // process ID 585 -1, // process ID
586 MSG_ROUTING_NONE, // routing ID 586 MSG_ROUTING_NONE, // routing ID
587 model_->profile()->GetResourceContext(), url, GURL(), mime_type, 587 model_->profile()->GetResourceContext(), url, GURL(), mime_type,
588 false, NULL, &plugin, NULL)); 588 false, NULL, &plugin, NULL));
589 } 589 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.h ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698