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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 1268593002: Fix the UI issue for showing output muted in ash tray after the device wakes up with hdmi output re… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454
Patch Set: Created 5 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
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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 } 517 }
518 518
519 int output_mute_changed_count() const { 519 int output_mute_changed_count() const {
520 return output_mute_changed_count_; 520 return output_mute_changed_count_;
521 } 521 }
522 522
523 ~TestAudioObserver() override {} 523 ~TestAudioObserver() override {}
524 524
525 protected: 525 protected:
526 // chromeos::CrasAudioHandler::AudioObserver overrides. 526 // chromeos::CrasAudioHandler::AudioObserver overrides.
527 void OnOutputMuteChanged(bool /* mute_on */) override { 527 void OnOutputMuteChanged(bool /* mute_on */,
528 bool /* system_adjust */) override {
528 ++output_mute_changed_count_; 529 ++output_mute_changed_count_;
529 } 530 }
530 531
531 private: 532 private:
532 int output_mute_changed_count_; 533 int output_mute_changed_count_;
533 534
534 DISALLOW_COPY_AND_ASSIGN(TestAudioObserver); 535 DISALLOW_COPY_AND_ASSIGN(TestAudioObserver);
535 }; 536 };
536 #endif 537 #endif
537 538
(...skipping 3294 matching lines...) Expand 10 before | Expand all | Expand 10 after
3832 PrefService* prefs = browser()->profile()->GetPrefs(); 3833 PrefService* prefs = browser()->profile()->GetPrefs();
3833 EXPECT_TRUE(extensions::MessageService::IsNativeMessagingHostAllowed( 3834 EXPECT_TRUE(extensions::MessageService::IsNativeMessagingHostAllowed(
3834 prefs, "host.name")); 3835 prefs, "host.name"));
3835 EXPECT_FALSE(extensions::MessageService::IsNativeMessagingHostAllowed( 3836 EXPECT_FALSE(extensions::MessageService::IsNativeMessagingHostAllowed(
3836 prefs, "other.host.name")); 3837 prefs, "other.host.name"));
3837 } 3838 }
3838 3839
3839 #endif // !defined(CHROME_OS) 3840 #endif // !defined(CHROME_OS)
3840 3841
3841 } // namespace policy 3842 } // namespace policy
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_notifier.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698