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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/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/toolbar/wrench_menu_model.h" 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
11 #include "app/resource_bundle.h"
12 #include "base/command_line.h" 11 #include "base/command_line.h"
13 #include "base/i18n/number_formatting.h" 12 #include "base/i18n/number_formatting.h"
14 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
15 #include "base/string_util.h" 14 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
17 #include "chrome/app/chrome_command_ids.h" 16 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/browser/background_page_tracker.h" 17 #include "chrome/browser/background_page_tracker.h"
19 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/defaults.h" 19 #include "chrome/browser/defaults.h"
21 #include "chrome/browser/prefs/pref_service.h" 20 #include "chrome/browser/prefs/pref_service.h"
22 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/sync/profile_sync_service.h" 22 #include "chrome/browser/sync/profile_sync_service.h"
24 #include "chrome/browser/sync/sync_ui_util.h" 23 #include "chrome/browser/sync/sync_ui_util.h"
25 #include "chrome/browser/tab_contents/tab_contents.h" 24 #include "chrome/browser/tab_contents/tab_contents.h"
26 #include "chrome/browser/tabs/tab_strip_model.h" 25 #include "chrome/browser/tabs/tab_strip_model.h"
27 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
28 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" 27 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
29 #include "chrome/browser/upgrade_detector.h" 28 #include "chrome/browser/upgrade_detector.h"
30 #include "chrome/common/chrome_switches.h" 29 #include "chrome/common/chrome_switches.h"
31 #include "chrome/common/notification_service.h" 30 #include "chrome/common/notification_service.h"
32 #include "chrome/common/notification_source.h" 31 #include "chrome/common/notification_source.h"
33 #include "chrome/common/notification_type.h" 32 #include "chrome/common/notification_type.h"
34 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
35 #include "grit/chromium_strings.h" 34 #include "grit/chromium_strings.h"
36 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
37 #include "grit/theme_resources.h" 36 #include "grit/theme_resources.h"
38 #include "ui/base/models/button_menu_item_model.h" 37 #include "ui/base/models/button_menu_item_model.h"
38 #include "ui/base/resource/resource_bundle.h"
39 39
40 #if defined(OS_LINUX) 40 #if defined(OS_LINUX)
41 #include <gtk/gtk.h> 41 #include <gtk/gtk.h>
42 #include "chrome/browser/ui/gtk/gtk_util.h" 42 #include "chrome/browser/ui/gtk/gtk_util.h"
43 #endif 43 #endif
44 44
45 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
46 #include "chrome/browser/ui/browser_window.h" 46 #include "chrome/browser/ui/browser_window.h"
47 #endif 47 #endif
48 48
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 &enable_increment, &enable_decrement); 506 &enable_increment, &enable_decrement);
507 } 507 }
508 zoom_label_ = l10n_util::GetStringFUTF16( 508 zoom_label_ = l10n_util::GetStringFUTF16(
509 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 509 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
510 } 510 }
511 511
512 string16 WrenchMenuModel::GetSyncMenuLabel() const { 512 string16 WrenchMenuModel::GetSyncMenuLabel() const {
513 return sync_ui_util::GetSyncMenuLabel( 513 return sync_ui_util::GetSyncMenuLabel(
514 browser_->profile()->GetOriginalProfile()->GetProfileSyncService()); 514 browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
515 } 515 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/back_forward_menu_model.cc ('k') | chrome/browser/ui/views/about_chrome_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698