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

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

Issue 9619025: Move FindPasteboard to ui/base/cocoa since it's used by two modules (content+chrome). (Closed) Base URL: svn://chrome-svn/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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" 191 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
192 #include "chrome/browser/shell_integration.h" 192 #include "chrome/browser/shell_integration.h"
193 #include "chrome/browser/ssl/ssl_error_info.h" 193 #include "chrome/browser/ssl/ssl_error_info.h"
194 #include "chrome/browser/task_manager/task_manager.h" 194 #include "chrome/browser/task_manager/task_manager.h"
195 #include "chrome/browser/ui/view_ids.h" 195 #include "chrome/browser/ui/view_ids.h"
196 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 196 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
197 #include "ui/base/win/shell.h" 197 #include "ui/base/win/shell.h"
198 #endif // OS_WIN 198 #endif // OS_WIN
199 199
200 #if defined(OS_MACOSX) 200 #if defined(OS_MACOSX)
201 #include "content/browser/find_pasteboard.h" 201 #include "ui/base/clipboard/find_pasteboard.h"
202 #endif 202 #endif
203 203
204 #if defined(OS_CHROMEOS) 204 #if defined(OS_CHROMEOS)
205 #include "chrome/browser/chromeos/boot_times_loader.h" 205 #include "chrome/browser/chromeos/boot_times_loader.h"
206 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 206 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
207 #include "chrome/browser/chromeos/dbus/power_manager_client.h" 207 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
208 #if defined(USE_AURA) 208 #if defined(USE_AURA)
209 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" 209 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
210 #endif 210 #endif
211 #include "chrome/browser/ui/webui/active_downloads_ui.h" 211 #include "chrome/browser/ui/webui/active_downloads_ui.h"
(...skipping 5436 matching lines...) Expand 10 before | Expand all | Expand 10 after
5648 ShowSingletonTabOverwritingNTP(params); 5648 ShowSingletonTabOverwritingNTP(params);
5649 } else { 5649 } else {
5650 LoginUIServiceFactory::GetForProfile( 5650 LoginUIServiceFactory::GetForProfile(
5651 profile()->GetOriginalProfile())->ShowLoginUI(); 5651 profile()->GetOriginalProfile())->ShowLoginUI();
5652 } 5652 }
5653 } 5653 }
5654 5654
5655 void Browser::ToggleSpeechInput() { 5655 void Browser::ToggleSpeechInput() {
5656 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); 5656 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
5657 } 5657 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm » ('j') | ui/base/clipboard/find_pasteboard.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698