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

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

Issue 8819019: Fixed 'singleton' behavior of filebrowser (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed aurora compilation error. Created 8 years, 10 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 2309 matching lines...) Expand 10 before | Expand all | Expand 10 after
2320 } 2320 }
2321 2321
2322 void Browser::OpenSearchEngineOptionsDialog() { 2322 void Browser::OpenSearchEngineOptionsDialog() {
2323 content::RecordAction(UserMetricsAction("EditSearchEngines")); 2323 content::RecordAction(UserMetricsAction("EditSearchEngines"));
2324 ShowOptionsTab(chrome::kSearchEnginesSubPage); 2324 ShowOptionsTab(chrome::kSearchEnginesSubPage);
2325 } 2325 }
2326 2326
2327 #if defined(FILE_MANAGER_EXTENSION) 2327 #if defined(FILE_MANAGER_EXTENSION)
2328 void Browser::OpenFileManager() { 2328 void Browser::OpenFileManager() {
2329 content::RecordAction(UserMetricsAction("OpenFileManager")); 2329 content::RecordAction(UserMetricsAction("OpenFileManager"));
2330 ShowSingletonTabRespectRef(GURL(chrome::kChromeUIFileManagerURL)); 2330 OpenURL(OpenURLParams(GURL(chrome::kChromeUIFileManagerURL), Referrer(),
2331 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
2331 } 2332 }
2332 #endif 2333 #endif
2333 2334
2334 #if defined(OS_CHROMEOS) 2335 #if defined(OS_CHROMEOS)
2335 void Browser::LockScreen() { 2336 void Browser::LockScreen() {
2336 content::RecordAction(UserMetricsAction("LockScreen")); 2337 content::RecordAction(UserMetricsAction("LockScreen"));
2337 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 2338 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
2338 NotifyScreenLockRequested(); 2339 NotifyScreenLockRequested();
2339 } 2340 }
2340 2341
(...skipping 3146 matching lines...) Expand 10 before | Expand all | Expand 10 after
5487 local_state->SetBoolean(prefs::kShouldShowFirstRunBubble, false); 5488 local_state->SetBoolean(prefs::kShouldShowFirstRunBubble, false);
5488 window_->GetLocationBar()->ShowFirstRunBubble(); 5489 window_->GetLocationBar()->ShowFirstRunBubble();
5489 } else { 5490 } else {
5490 GlobalErrorService* service = 5491 GlobalErrorService* service =
5491 GlobalErrorServiceFactory::GetForProfile(profile()); 5492 GlobalErrorServiceFactory::GetForProfile(profile());
5492 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5493 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5493 if (error) 5494 if (error)
5494 error->ShowBubbleView(this); 5495 error->ShowBubbleView(this);
5495 } 5496 }
5496 } 5497 }
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