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

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

Issue 9753019: ash: Add a bluetooth entry in the uber tray. (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
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 2539 matching lines...) Expand 10 before | Expand all | Expand 10 after
2550 if (CommandLine::ForCurrentProcess()->HasSwitch( 2550 if (CommandLine::ForCurrentProcess()->HasSwitch(
2551 switches::kEnableMobileSetupDialog)) { 2551 switches::kEnableMobileSetupDialog)) {
2552 window_->ShowMobileSetup(); 2552 window_->ShowMobileSetup();
2553 } else { 2553 } else {
2554 OpenURL(OpenURLParams( 2554 OpenURL(OpenURLParams(
2555 GURL(chrome::kChromeUIMobileSetupURL), Referrer(), NEW_FOREGROUND_TAB, 2555 GURL(chrome::kChromeUIMobileSetupURL), Referrer(), NEW_FOREGROUND_TAB,
2556 content::PAGE_TRANSITION_LINK, false)); 2556 content::PAGE_TRANSITION_LINK, false));
2557 window_->Activate(); 2557 window_->Activate();
2558 } 2558 }
2559 } 2559 }
2560 #endif 2560
2561 void Browser::OpenAddBluetoothDeviceDialog() {
2562 content::RecordAction(UserMetricsAction("OpenAddBluetoothDeviceDialog"));
2563 ShowOptionsTab(chrome::kBluetoothAddDeviceSubPage);
2564 }
2565 #endif // defined(OS_CHROMEOS)
2561 2566
2562 #if defined(OS_CHROMEOS) && defined(USE_AURA) 2567 #if defined(OS_CHROMEOS) && defined(USE_AURA)
2563 void Browser::OpenCrosh() { 2568 void Browser::OpenCrosh() {
2564 GURL crosh_url = TerminalExtensionHelper::GetCroshExtensionURL(profile_); 2569 GURL crosh_url = TerminalExtensionHelper::GetCroshExtensionURL(profile_);
2565 if (!crosh_url.is_valid()) 2570 if (!crosh_url.is_valid())
2566 return; 2571 return;
2567 OpenURL(OpenURLParams(crosh_url, Referrer(), NEW_FOREGROUND_TAB, 2572 OpenURL(OpenURLParams(crosh_url, Referrer(), NEW_FOREGROUND_TAB,
2568 content::PAGE_TRANSITION_GENERATED, 2573 content::PAGE_TRANSITION_GENERATED,
2569 false)); 2574 false));
2570 } 2575 }
(...skipping 3104 matching lines...) Expand 10 before | Expand all | Expand 10 after
5675 } else { 5680 } else {
5676 LoginUIServiceFactory::GetForProfile( 5681 LoginUIServiceFactory::GetForProfile(
5677 profile()->GetOriginalProfile())->ShowLoginUI(false); 5682 profile()->GetOriginalProfile())->ShowLoginUI(false);
5678 } 5683 }
5679 #endif 5684 #endif
5680 } 5685 }
5681 5686
5682 void Browser::ToggleSpeechInput() { 5687 void Browser::ToggleSpeechInput() {
5683 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); 5688 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
5684 } 5689 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698