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

Side by Side Diff: chrome/browser/ui/toolbar/media_router_action.cc

Issue 1826403002: [Media Router] Moves mojo-specific code into mojo/ folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert change to media_router.mojom to fix compile 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/toolbar/media_router_action.h" 5 #include "chrome/browser/ui/toolbar/media_router_action.h"
6 6
7 #include "base/metrics/user_metrics.h" 7 #include "base/metrics/user_metrics.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/media/router/issue.h" 9 #include "chrome/browser/media/router/issue.h"
10 #include "chrome/browser/media/router/media_route.h" 10 #include "chrome/browser/media/router/media_route.h"
11 #include "chrome/browser/media/router/media_router.h" 11 #include "chrome/browser/media/router/media_router.h"
12 #include "chrome/browser/media/router/media_router_factory.h" 12 #include "chrome/browser/media/router/media_router_factory.h"
13 #include "chrome/browser/media/router/media_router_metrics.h" 13 #include "chrome/browser/media/router/media_router_metrics.h"
14 #include "chrome/browser/media/router/media_router_mojo_impl.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 16 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" 17 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
19 #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h" 18 #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h"
20 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" 19 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
21 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h" 20 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h"
22 #include "chrome/grit/generated_resources.h" 21 #include "chrome/grit/generated_resources.h"
23 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
24 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 if (issue_) { 247 if (issue_) {
249 if (issue_->severity() == media_router::Issue::FATAL) 248 if (issue_->severity() == media_router::Issue::FATAL)
250 return &media_router_error_icon_; 249 return &media_router_error_icon_;
251 if (issue_->severity() == media_router::Issue::WARNING) 250 if (issue_->severity() == media_router::Issue::WARNING)
252 return &media_router_warning_icon_; 251 return &media_router_warning_icon_;
253 } 252 }
254 253
255 return has_local_display_route_ ? &media_router_active_icon_ 254 return has_local_display_route_ ? &media_router_active_icon_
256 : &media_router_idle_icon_; 255 : &media_router_idle_icon_;
257 } 256 }
OLDNEW
« no previous file with comments | « chrome/browser/media/router/test_helper.cc ('k') | chrome/browser/ui/toolbar/media_router_contextual_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698