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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 796543002: Plugin Power Saver: Implement option in Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix one more test :( Created 6 years 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 content::PermissionStatus 602 content::PermissionStatus
603 ContentSettingToPermissionStatus(ContentSetting setting) { 603 ContentSettingToPermissionStatus(ContentSetting setting) {
604 switch (setting) { 604 switch (setting) {
605 case CONTENT_SETTING_ALLOW: 605 case CONTENT_SETTING_ALLOW:
606 case CONTENT_SETTING_SESSION_ONLY: 606 case CONTENT_SETTING_SESSION_ONLY:
607 return content::PERMISSION_STATUS_GRANTED; 607 return content::PERMISSION_STATUS_GRANTED;
608 case CONTENT_SETTING_BLOCK: 608 case CONTENT_SETTING_BLOCK:
609 return content::PERMISSION_STATUS_DENIED; 609 return content::PERMISSION_STATUS_DENIED;
610 case CONTENT_SETTING_ASK: 610 case CONTENT_SETTING_ASK:
611 return content::PERMISSION_STATUS_ASK; 611 return content::PERMISSION_STATUS_ASK;
612 case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
612 case CONTENT_SETTING_DEFAULT: 613 case CONTENT_SETTING_DEFAULT:
613 case CONTENT_SETTING_NUM_SETTINGS: 614 case CONTENT_SETTING_NUM_SETTINGS:
614 break; 615 break;
615 } 616 }
616 NOTREACHED(); 617 NOTREACHED();
617 return content::PERMISSION_STATUS_DENIED; 618 return content::PERMISSION_STATUS_DENIED;
618 } 619 }
619 620
620 } // namespace 621 } // namespace
621 622
(...skipping 1990 matching lines...) Expand 10 before | Expand all | Expand 10 after
2612 switches::kDisableWebRtcEncryption, 2613 switches::kDisableWebRtcEncryption,
2613 }; 2614 };
2614 to_command_line->CopySwitchesFrom(from_command_line, 2615 to_command_line->CopySwitchesFrom(from_command_line,
2615 kWebRtcDevSwitchNames, 2616 kWebRtcDevSwitchNames,
2616 arraysize(kWebRtcDevSwitchNames)); 2617 arraysize(kWebRtcDevSwitchNames));
2617 } 2618 }
2618 } 2619 }
2619 #endif // defined(ENABLE_WEBRTC) 2620 #endif // defined(ENABLE_WEBRTC)
2620 2621
2621 } // namespace chrome 2622 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698