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

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

Issue 10660021: HiDPI assets for omnibox icons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros Created 8 years, 6 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/toolbar/toolbar_model.h" 5 #include "chrome/browser/ui/toolbar/toolbar_model.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/autocomplete/autocomplete.h" 8 #include "chrome/browser/autocomplete/autocomplete.h"
9 #include "chrome/browser/prefs/pref_service.h" 9 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ssl/ssl_error_info.h" 11 #include "chrome/browser/ssl/ssl_error_info.h"
12 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" 12 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
13 #include "chrome/common/chrome_constants.h" 13 #include "chrome/common/chrome_constants.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "content/public/browser/cert_store.h" 16 #include "content/public/browser/cert_store.h"
17 #include "content/public/browser/navigation_controller.h" 17 #include "content/public/browser/navigation_controller.h"
18 #include "content/public/browser/navigation_entry.h" 18 #include "content/public/browser/navigation_entry.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_ui.h" 20 #include "content/public/browser/web_ui.h"
21 #include "content/public/common/content_constants.h" 21 #include "content/public/common/content_constants.h"
22 #include "content/public/common/ssl_status.h" 22 #include "content/public/common/ssl_status.h"
23 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
24 #include "grit/theme_resources.h" 24 #include "grit/theme_resources_standard.h"
25 #include "net/base/cert_status_flags.h" 25 #include "net/base/cert_status_flags.h"
26 #include "net/base/net_util.h" 26 #include "net/base/net_util.h"
27 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
28 28
29 using content::NavigationController; 29 using content::NavigationController;
30 using content::NavigationEntry; 30 using content::NavigationEntry;
31 using content::SSLStatus; 31 using content::SSLStatus;
32 using content::WebContents; 32 using content::WebContents;
33 33
34 ToolbarModel::ToolbarModel(ToolbarModelDelegate* delegate) 34 ToolbarModel::ToolbarModel(ToolbarModelDelegate* delegate)
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 UTF8ToUTF16(cert.subject().country_name)); 169 UTF8ToUTF16(cert.subject().country_name));
170 } 170 }
171 171
172 NavigationController* ToolbarModel::GetNavigationController() const { 172 NavigationController* ToolbarModel::GetNavigationController() const {
173 // This |current_tab| can be NULL during the initialization of the 173 // This |current_tab| can be NULL during the initialization of the
174 // toolbar during window creation (i.e. before any tabs have been added 174 // toolbar during window creation (i.e. before any tabs have been added
175 // to the window). 175 // to the window).
176 WebContents* current_tab = delegate_->GetActiveWebContents(); 176 WebContents* current_tab = delegate_->GetActiveWebContents();
177 return current_tab ? &current_tab->GetController() : NULL; 177 return current_tab ? &current_tab->GetController() : NULL;
178 } 178 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc ('k') | chrome/browser/ui/views/ash/app_list/search_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698