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

Side by Side Diff: chrome/browser/ui/chrome_pages.cc

Issue 1266583003: Fix the links in the media bubble pointing to the media UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename Show[Default]ContentSettings[Exceptions] 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 "chrome/browser/ui/chrome_pages.h" 5 #include "chrome/browser/ui/chrome_pages.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 288
289 void ShowSettingsSubPageInTabbedBrowser(Browser* browser, 289 void ShowSettingsSubPageInTabbedBrowser(Browser* browser,
290 const std::string& sub_page) { 290 const std::string& sub_page) {
291 content::RecordAction(UserMetricsAction("ShowOptions")); 291 content::RecordAction(UserMetricsAction("ShowOptions"));
292 GURL gurl = GetSettingsUrl(sub_page); 292 GURL gurl = GetSettingsUrl(sub_page);
293 NavigateParams params(GetSingletonTabNavigateParams(browser, gurl)); 293 NavigateParams params(GetSingletonTabNavigateParams(browser, gurl));
294 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; 294 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
295 ShowSingletonTabOverwritingNTP(browser, params); 295 ShowSingletonTabOverwritingNTP(browser, params);
296 } 296 }
297 297
298 void ShowContentSettingsExceptions(Browser* browser,
299 ContentSettingsType content_settings_type) {
300 ShowSettingsSubPage(
301 browser,
302 kContentSettingsExceptionsSubPage + std::string(kHashMark) +
303 options::ContentSettingsHandler::ContentSettingsTypeToGroupName(
304 content_settings_type));
305 }
306
298 void ShowContentSettings(Browser* browser, 307 void ShowContentSettings(Browser* browser,
299 ContentSettingsType content_settings_type) { 308 ContentSettingsType content_settings_type) {
300 ShowSettingsSubPage( 309 ShowSettingsSubPage(
301 browser, 310 browser,
302 kContentSettingsExceptionsSubPage + std::string(kHashMark) + 311 kContentSettingsSubPage + std::string(kHashMark) +
303 options::ContentSettingsHandler::ContentSettingsTypeToGroupName( 312 options::ContentSettingsHandler::ContentSettingsTypeToGroupName(
304 content_settings_type)); 313 content_settings_type));
305 } 314 }
306 315
307 void ShowClearBrowsingDataDialog(Browser* browser) { 316 void ShowClearBrowsingDataDialog(Browser* browser) {
308 content::RecordAction(UserMetricsAction("ClearBrowsingData_ShowDlg")); 317 content::RecordAction(UserMetricsAction("ClearBrowsingData_ShowDlg"));
309 ShowSettingsSubPage(browser, kClearBrowserDataSubPage); 318 ShowSettingsSubPage(browser, kClearBrowserDataSubPage);
310 } 319 }
311 320
312 void ShowPasswordManager(Browser* browser) { 321 void ShowPasswordManager(Browser* browser) {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 SigninManagerFactory::GetForProfile(original_profile); 389 SigninManagerFactory::GetForProfile(original_profile);
381 DCHECK(manager->IsSigninAllowed()); 390 DCHECK(manager->IsSigninAllowed());
382 if (manager->IsAuthenticated()) 391 if (manager->IsAuthenticated())
383 ShowSettings(browser); 392 ShowSettings(browser);
384 else 393 else
385 ShowBrowserSignin(browser, source); 394 ShowBrowserSignin(browser, source);
386 } 395 }
387 #endif 396 #endif
388 397
389 } // namespace chrome 398 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698