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

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

Issue 8934019: chromeos: Remove ScreenLockLibrary. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years 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 | « chrome/browser/chromeos/cros/screen_lock_library.cc ('k') | chrome/chrome_browser.gypi » ('j') | 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) 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 183 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
184 #include "ui/base/win/shell.h" 184 #include "ui/base/win/shell.h"
185 #endif // OS_WIN 185 #endif // OS_WIN
186 186
187 #if defined(OS_MACOSX) 187 #if defined(OS_MACOSX)
188 #include "content/browser/find_pasteboard.h" 188 #include "content/browser/find_pasteboard.h"
189 #endif 189 #endif
190 190
191 #if defined(OS_CHROMEOS) 191 #if defined(OS_CHROMEOS)
192 #include "chrome/browser/chromeos/boot_times_loader.h" 192 #include "chrome/browser/chromeos/boot_times_loader.h"
193 #include "chrome/browser/chromeos/cros/cros_library.h"
194 #include "chrome/browser/chromeos/cros/screen_lock_library.h"
195 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 193 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
196 #include "chrome/browser/chromeos/dbus/power_manager_client.h" 194 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
197 #include "chrome/browser/ui/webui/active_downloads_ui.h" 195 #include "chrome/browser/ui/webui/active_downloads_ui.h"
198 #endif 196 #endif
199 197
200 #if !defined(OS_CHROMEOS) || defined(USE_AURA) 198 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
201 #include "chrome/browser/download/download_shelf.h" 199 #include "chrome/browser/download/download_shelf.h"
202 #endif 200 #endif
203 201
204 #if defined(FILE_MANAGER_EXTENSION) 202 #if defined(FILE_MANAGER_EXTENSION)
(...skipping 2052 matching lines...) Expand 10 before | Expand all | Expand 10 after
2257 #if defined(FILE_MANAGER_EXTENSION) 2255 #if defined(FILE_MANAGER_EXTENSION)
2258 void Browser::OpenFileManager() { 2256 void Browser::OpenFileManager() {
2259 content::RecordAction(UserMetricsAction("OpenFileManager")); 2257 content::RecordAction(UserMetricsAction("OpenFileManager"));
2260 ShowSingletonTabRespectRef(GURL(chrome::kChromeUIFileManagerURL)); 2258 ShowSingletonTabRespectRef(GURL(chrome::kChromeUIFileManagerURL));
2261 } 2259 }
2262 #endif 2260 #endif
2263 2261
2264 #if defined(OS_CHROMEOS) 2262 #if defined(OS_CHROMEOS)
2265 void Browser::LockScreen() { 2263 void Browser::LockScreen() {
2266 content::RecordAction(UserMetricsAction("LockScreen")); 2264 content::RecordAction(UserMetricsAction("LockScreen"));
2267 chromeos::CrosLibrary::Get()->GetScreenLockLibrary()-> 2265 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
2268 NotifyScreenLockRequested(); 2266 NotifyScreenLockRequested();
2269 } 2267 }
2270 2268
2271 void Browser::Shutdown() { 2269 void Browser::Shutdown() {
2272 content::RecordAction(UserMetricsAction("Shutdown")); 2270 content::RecordAction(UserMetricsAction("Shutdown"));
2273 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 2271 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
2274 RequestShutdown(); 2272 RequestShutdown();
2275 } 2273 }
2276 2274
2277 void Browser::OpenSystemOptionsDialog() { 2275 void Browser::OpenSystemOptionsDialog() {
(...skipping 3076 matching lines...) Expand 10 before | Expand all | Expand 10 after
5354 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); 5352 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
5355 } else { 5353 } else {
5356 GlobalErrorService* service = 5354 GlobalErrorService* service =
5357 GlobalErrorServiceFactory::GetForProfile(profile()); 5355 GlobalErrorServiceFactory::GetForProfile(profile());
5358 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5356 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5359 if (error) { 5357 if (error) {
5360 error->ShowBubbleView(this); 5358 error->ShowBubbleView(this);
5361 } 5359 }
5362 } 5360 }
5363 } 5361 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/screen_lock_library.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698