Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 2219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2230 } | 2230 } |
| 2231 | 2231 |
| 2232 void Browser::OpenSearchEngineOptionsDialog() { | 2232 void Browser::OpenSearchEngineOptionsDialog() { |
| 2233 UserMetrics::RecordAction(UserMetricsAction("EditSearchEngines")); | 2233 UserMetrics::RecordAction(UserMetricsAction("EditSearchEngines")); |
| 2234 ShowOptionsTab(chrome::kSearchEnginesSubPage); | 2234 ShowOptionsTab(chrome::kSearchEnginesSubPage); |
| 2235 } | 2235 } |
| 2236 | 2236 |
| 2237 #if defined(FILE_MANAGER_EXTENSION) | 2237 #if defined(FILE_MANAGER_EXTENSION) |
| 2238 void Browser::OpenFileManager() { | 2238 void Browser::OpenFileManager() { |
| 2239 UserMetrics::RecordAction(UserMetricsAction("OpenFileManager")); | 2239 UserMetrics::RecordAction(UserMetricsAction("OpenFileManager")); |
| 2240 ShowSingletonTabRespectRef(GURL(chrome::kChromeUIFileManagerURL)); | 2240 OpenURL(GURL(chrome::kChromeUIFileManagerURL), GURL(), |
| 2241 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK); | |
|
dgozman
2011/12/06 13:22:27
Are you sure that PAGE_TRANSITION_LINK is the righ
Dmitry Zvorygin
2012/01/20 10:32:03
Sure.
| |
| 2241 } | 2242 } |
| 2242 #endif | 2243 #endif |
| 2243 | 2244 |
| 2244 #if defined(OS_CHROMEOS) | 2245 #if defined(OS_CHROMEOS) |
| 2245 void Browser::LockScreen() { | 2246 void Browser::LockScreen() { |
| 2246 UserMetrics::RecordAction(UserMetricsAction("LockScreen")); | 2247 UserMetrics::RecordAction(UserMetricsAction("LockScreen")); |
| 2247 chromeos::CrosLibrary::Get()->GetScreenLockLibrary()-> | 2248 chromeos::CrosLibrary::Get()->GetScreenLockLibrary()-> |
| 2248 NotifyScreenLockRequested(); | 2249 NotifyScreenLockRequested(); |
| 2249 } | 2250 } |
| 2250 | 2251 |
| (...skipping 3075 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5326 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5327 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
| 5327 } else { | 5328 } else { |
| 5328 GlobalErrorService* service = | 5329 GlobalErrorService* service = |
| 5329 GlobalErrorServiceFactory::GetForProfile(profile()); | 5330 GlobalErrorServiceFactory::GetForProfile(profile()); |
| 5330 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5331 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
| 5331 if (error) { | 5332 if (error) { |
| 5332 error->ShowBubbleView(this); | 5333 error->ShowBubbleView(this); |
| 5333 } | 5334 } |
| 5334 } | 5335 } |
| 5335 } | 5336 } |
| OLD | NEW |