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

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

Issue 1827083004: UI: Rename MediaState to AlertState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-tab-indicator
Patch Set: Sett -> See Created 4 years, 8 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/tab_renderer_data.h" 5 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
6 6
7 #include "base/process/kill.h" 7 #include "base/process/kill.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 TabRendererData::TabRendererData() 10 TabRendererData::TabRendererData()
11 : network_state(NETWORK_STATE_NONE), 11 : network_state(NETWORK_STATE_NONE),
12 loading(false), 12 loading(false),
13 crashed_status(base::TERMINATION_STATUS_STILL_RUNNING), 13 crashed_status(base::TERMINATION_STATUS_STILL_RUNNING),
14 incognito(false), 14 incognito(false),
15 show_icon(true), 15 show_icon(true),
16 pinned(false), 16 pinned(false),
17 blocked(false), 17 blocked(false),
18 app(false), 18 app(false),
19 media_state(TAB_MEDIA_STATE_NONE) { 19 alert_state(TabAlertState::NONE) {}
20 }
21 20
22 TabRendererData::TabRendererData(const TabRendererData& other) = default; 21 TabRendererData::TabRendererData(const TabRendererData& other) = default;
23 22
24 TabRendererData::~TabRendererData() {} 23 TabRendererData::~TabRendererData() {}
25 24
26 bool TabRendererData::IsCrashed() const { 25 bool TabRendererData::IsCrashed() const {
27 return (crashed_status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED || 26 return (crashed_status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ||
28 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
29 crashed_status == 28 crashed_status ==
30 base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM || 29 base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM ||
31 #endif 30 #endif
32 crashed_status == base::TERMINATION_STATUS_PROCESS_CRASHED || 31 crashed_status == base::TERMINATION_STATUS_PROCESS_CRASHED ||
33 crashed_status == base::TERMINATION_STATUS_ABNORMAL_TERMINATION || 32 crashed_status == base::TERMINATION_STATUS_ABNORMAL_TERMINATION ||
34 crashed_status == base::TERMINATION_STATUS_LAUNCH_FAILED); 33 crashed_status == base::TERMINATION_STATUS_LAUNCH_FAILED);
35 } 34 }
36 35
37 bool TabRendererData::Equals(const TabRendererData& data) { 36 bool TabRendererData::Equals(const TabRendererData& data) {
38 return 37 return
39 favicon.BackedBySameObjectAs(data.favicon) && 38 favicon.BackedBySameObjectAs(data.favicon) &&
40 network_state == data.network_state && 39 network_state == data.network_state &&
41 title == data.title && 40 title == data.title &&
42 url == data.url && 41 url == data.url &&
43 loading == data.loading && 42 loading == data.loading &&
44 crashed_status == data.crashed_status && 43 crashed_status == data.crashed_status &&
45 incognito == data.incognito && 44 incognito == data.incognito &&
46 show_icon == data.show_icon && 45 show_icon == data.show_icon &&
47 pinned == data.pinned && 46 pinned == data.pinned &&
48 blocked == data.blocked && 47 blocked == data.blocked &&
49 app == data.app && 48 app == data.app &&
50 media_state == data.media_state; 49 alert_state == data.alert_state;
51 } 50 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698