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

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

Issue 9877007: [cros] Fix sub-page URL generated by ShowDateOptions() to work properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 2489 matching lines...) Expand 10 before | Expand all | Expand 10 after
2500 2500
2501 void Browser::Shutdown() { 2501 void Browser::Shutdown() {
2502 content::RecordAction(UserMetricsAction("Shutdown")); 2502 content::RecordAction(UserMetricsAction("Shutdown"));
2503 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 2503 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
2504 RequestShutdown(); 2504 RequestShutdown();
2505 } 2505 }
2506 2506
2507 void Browser::ShowDateOptions() { 2507 void Browser::ShowDateOptions() {
2508 content::RecordAction(UserMetricsAction("ShowDateOptions")); 2508 content::RecordAction(UserMetricsAction("ShowDateOptions"));
2509 std::string sub_page = std::string(chrome::kSearchSubPage) + "#" + 2509 std::string sub_page = std::string(chrome::kSearchSubPage) + "#" +
2510 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY); 2510 l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
2511 ShowOptionsTab(sub_page); 2511 ShowOptionsTab(sub_page);
2512 } 2512 }
2513 2513
2514 void Browser::OpenInternetOptionsDialog() { 2514 void Browser::OpenInternetOptionsDialog() {
2515 content::RecordAction(UserMetricsAction("OpenInternetOptionsDialog")); 2515 content::RecordAction(UserMetricsAction("OpenInternetOptionsDialog"));
2516 ShowOptionsTab(chrome::kInternetOptionsSubPage); 2516 ShowOptionsTab(chrome::kInternetOptionsSubPage);
2517 } 2517 }
2518 2518
2519 void Browser::OpenLanguageOptionsDialog() { 2519 void Browser::OpenLanguageOptionsDialog() {
2520 content::RecordAction(UserMetricsAction("OpenLanguageOptionsDialog")); 2520 content::RecordAction(UserMetricsAction("OpenLanguageOptionsDialog"));
(...skipping 3148 matching lines...) Expand 10 before | Expand all | Expand 10 after
5669 } else { 5669 } else {
5670 LoginUIServiceFactory::GetForProfile( 5670 LoginUIServiceFactory::GetForProfile(
5671 profile()->GetOriginalProfile())->ShowLoginUI(false); 5671 profile()->GetOriginalProfile())->ShowLoginUI(false);
5672 } 5672 }
5673 #endif 5673 #endif
5674 } 5674 }
5675 5675
5676 void Browser::ToggleSpeechInput() { 5676 void Browser::ToggleSpeechInput() {
5677 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); 5677 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
5678 } 5678 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698