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

Side by Side Diff: chrome/browser/ui/views/frame/browser_root_view.cc

Issue 6192007: Remove wstring from views. Part 3: Switch accessibility strings to string16.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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) 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/views/frame/browser_root_view.h" 5 #include "chrome/browser/ui/views/frame/browser_root_view.h"
6 6
7 #include "app/drag_drop_types.h" 7 #include "app/drag_drop_types.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/autocomplete/autocomplete.h" 10 #include "chrome/browser/autocomplete/autocomplete.h"
11 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 11 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
12 #include "chrome/browser/autocomplete/autocomplete_match.h" 12 #include "chrome/browser/autocomplete/autocomplete_match.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/omnibox/location_bar.h" 14 #include "chrome/browser/ui/omnibox/location_bar.h"
15 #include "chrome/browser/ui/views/frame/browser_view.h" 15 #include "chrome/browser/ui/views/frame/browser_view.h"
16 #include "chrome/browser/ui/views/frame/browser_frame.h" 16 #include "chrome/browser/ui/views/frame/browser_frame.h"
17 #include "chrome/browser/ui/views/tabs/tab_strip.h" 17 #include "chrome/browser/ui/views/tabs/tab_strip.h"
18 #include "grit/chromium_strings.h" 18 #include "grit/chromium_strings.h"
19 #include "ui/base/dragdrop/os_exchange_data.h" 19 #include "ui/base/dragdrop/os_exchange_data.h"
20 20
21 BrowserRootView::BrowserRootView(BrowserView* browser_view, 21 BrowserRootView::BrowserRootView(BrowserView* browser_view,
22 views::Widget* widget) 22 views::Widget* widget)
23 : views::RootView(widget), 23 : views::RootView(widget),
24 browser_view_(browser_view), 24 browser_view_(browser_view),
25 forwarding_to_tab_strip_(false) { 25 forwarding_to_tab_strip_(false) {
26 SetAccessibleName(UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); 26 SetAccessibleName(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
27 } 27 }
28 28
29 bool BrowserRootView::GetDropFormats( 29 bool BrowserRootView::GetDropFormats(
30 int* formats, 30 int* formats,
31 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) { 31 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) {
32 if (tabstrip() && tabstrip()->IsVisible() && !tabstrip()->IsAnimating()) { 32 if (tabstrip() && tabstrip()->IsVisible() && !tabstrip()->IsAnimating()) {
33 *formats = ui::OSExchangeData::URL | ui::OSExchangeData::STRING; 33 *formats = ui::OSExchangeData::URL | ui::OSExchangeData::STRING;
34 return true; 34 return true;
35 } 35 }
36 return false; 36 return false;
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 AutocompleteMatch match; 148 AutocompleteMatch match;
149 browser_view_->browser()->profile()->GetAutocompleteClassifier()->Classify( 149 browser_view_->browser()->profile()->GetAutocompleteClassifier()->Classify(
150 text, std::wstring(), false, &match, NULL); 150 text, std::wstring(), false, &match, NULL);
151 if (!match.destination_url.is_valid()) 151 if (!match.destination_url.is_valid())
152 return false; 152 return false;
153 153
154 if (url) 154 if (url)
155 *url = match.destination_url; 155 *url = match.destination_url;
156 return true; 156 return true;
157 } 157 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698