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

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

Issue 2217273002: Desaturate the favicon shown in the tab when a network error is encountered (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added change for pinned tabs, reused NetworkState enum for net errors Created 4 years, 4 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/ui/views/tabs/tab.cc » ('j') | chrome/browser/ui/views/tabs/tab.cc » ('J')
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/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/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 17 matching lines...) Expand all
28 #include "chrome/browser/ui/views/tabs/tab_strip.h" 28 #include "chrome/browser/ui/views/tabs/tab_strip.h"
29 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
31 #include "components/favicon/content/content_favicon_driver.h" 31 #include "components/favicon/content/content_favicon_driver.h"
32 #include "components/metrics/proto/omnibox_event.pb.h" 32 #include "components/metrics/proto/omnibox_event.pb.h"
33 #include "components/mime_util/mime_util.h" 33 #include "components/mime_util/mime_util.h"
34 #include "components/omnibox/browser/autocomplete_classifier.h" 34 #include "components/omnibox/browser/autocomplete_classifier.h"
35 #include "components/omnibox/browser/autocomplete_match.h" 35 #include "components/omnibox/browser/autocomplete_match.h"
36 #include "components/prefs/pref_service.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/navigation_controller.h"
39 #include "content/public/browser/navigation_entry.h"
40 #include "content/public/browser/navigation_handle.h"
38 #include "content/public/browser/notification_service.h" 41 #include "content/public/browser/notification_service.h"
39 #include "content/public/browser/plugin_service.h" 42 #include "content/public/browser/plugin_service.h"
40 #include "content/public/browser/user_metrics.h" 43 #include "content/public/browser/user_metrics.h"
41 #include "content/public/browser/web_contents.h" 44 #include "content/public/browser/web_contents.h"
42 #include "content/public/common/webplugininfo.h" 45 #include "content/public/common/webplugininfo.h"
43 #include "ipc/ipc_message.h" 46 #include "ipc/ipc_message.h"
44 #include "net/base/filename_util.h" 47 #include "net/base/filename_util.h"
45 #include "ui/base/models/list_selection_model.h" 48 #include "ui/base/models/list_selection_model.h"
46 #include "ui/gfx/image/image.h" 49 #include "ui/gfx/image/image.h"
47 #include "ui/views/controls/menu/menu_runner.h" 50 #include "ui/views/controls/menu/menu_runner.h"
48 #include "ui/views/widget/widget.h" 51 #include "ui/views/widget/widget.h"
49 52
50 using base::UserMetricsAction; 53 using base::UserMetricsAction;
51 using content::WebContents; 54 using content::WebContents;
52 55
53 namespace { 56 namespace {
54 57
55 TabRendererData::NetworkState TabContentsNetworkState( 58 TabRendererData::NetworkState TabContentsNetworkState(
56 WebContents* contents) { 59 WebContents* contents) {
57 if (!contents || !contents->IsLoadingToDifferentDocument()) 60 if (!contents || !contents->IsLoadingToDifferentDocument()) {
61 if (contents) {
sky 2016/08/12 15:29:25 This is mildly awkward because of the !contents 1
edwardjung 2016/08/12 19:29:25 Done.
62 content::NavigationEntry* entry =
63 contents->GetController().GetLastCommittedEntry();
64 if (entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR))
65 return TabRendererData::NETWORK_STATE_ERROR;
66 }
58 return TabRendererData::NETWORK_STATE_NONE; 67 return TabRendererData::NETWORK_STATE_NONE;
68 }
59 if (contents->IsWaitingForResponse()) 69 if (contents->IsWaitingForResponse())
60 return TabRendererData::NETWORK_STATE_WAITING; 70 return TabRendererData::NETWORK_STATE_WAITING;
61 return TabRendererData::NETWORK_STATE_LOADING; 71 return TabRendererData::NETWORK_STATE_LOADING;
62 } 72 }
63 73
64 bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) { 74 bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {
65 *adjust_layout = false; 75 *adjust_layout = false;
66 // For ash, always allow entering stacked mode. 76 // For ash, always allow entering stacked mode.
67 #if defined(USE_ASH) 77 #if defined(USE_ASH)
68 *adjust_layout = true; 78 *adjust_layout = true;
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 content::WebPluginInfo plugin; 581 content::WebPluginInfo plugin;
572 tabstrip_->FileSupported( 582 tabstrip_->FileSupported(
573 url, 583 url,
574 mime_type.empty() || mime_util::IsSupportedMimeType(mime_type) || 584 mime_type.empty() || mime_util::IsSupportedMimeType(mime_type) ||
575 content::PluginService::GetInstance()->GetPluginInfo( 585 content::PluginService::GetInstance()->GetPluginInfo(
576 -1, // process ID 586 -1, // process ID
577 MSG_ROUTING_NONE, // routing ID 587 MSG_ROUTING_NONE, // routing ID
578 model_->profile()->GetResourceContext(), url, GURL(), mime_type, 588 model_->profile()->GetResourceContext(), url, GURL(), mime_type,
579 false, NULL, &plugin, NULL)); 589 false, NULL, &plugin, NULL));
580 } 590 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab.cc » ('j') | chrome/browser/ui/views/tabs/tab.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698