| OLD | NEW | 
|     1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |     1 // Copyright (c) 2009 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/views/toolbar_view.h" |     5 #include "chrome/browser/views/toolbar_view.h" | 
|     6  |     6  | 
|     7 #include <string> |     7 #include <string> | 
|     8  |     8  | 
|     9 #include "app/drag_drop_types.h" |     9 #include "app/drag_drop_types.h" | 
|    10 #include "app/gfx/canvas.h" |    10 #include "app/gfx/canvas.h" | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
|    33 #include "chrome/browser/views/go_button.h" |    33 #include "chrome/browser/views/go_button.h" | 
|    34 #include "chrome/browser/views/location_bar_view.h" |    34 #include "chrome/browser/views/location_bar_view.h" | 
|    35 #include "chrome/browser/views/toolbar_star_toggle.h" |    35 #include "chrome/browser/views/toolbar_star_toggle.h" | 
|    36 #include "chrome/browser/view_ids.h" |    36 #include "chrome/browser/view_ids.h" | 
|    37 #include "chrome/common/chrome_constants.h" |    37 #include "chrome/common/chrome_constants.h" | 
|    38 #include "chrome/common/chrome_switches.h" |    38 #include "chrome/common/chrome_switches.h" | 
|    39 #include "chrome/common/notification_service.h" |    39 #include "chrome/common/notification_service.h" | 
|    40 #include "chrome/common/pref_names.h" |    40 #include "chrome/common/pref_names.h" | 
|    41 #include "chrome/common/pref_service.h" |    41 #include "chrome/common/pref_service.h" | 
|    42 #ifdef CHROME_PERSONALIZATION |    42 #ifdef CHROME_PERSONALIZATION | 
|    43 #include "chrome/personalization/personalization.h" |    43 #include "chrome/browser/sync/personalization.h" | 
|    44 #endif |    44 #endif | 
|    45 #include "grit/chromium_strings.h" |    45 #include "grit/chromium_strings.h" | 
|    46 #include "grit/generated_resources.h" |    46 #include "grit/generated_resources.h" | 
|    47 #include "grit/theme_resources.h" |    47 #include "grit/theme_resources.h" | 
|    48 #include "net/base/net_util.h" |    48 #include "net/base/net_util.h" | 
|    49 #include "views/background.h" |    49 #include "views/background.h" | 
|    50 #include "views/controls/button/button_dropdown.h" |    50 #include "views/controls/button/button_dropdown.h" | 
|    51 #include "views/controls/label.h" |    51 #include "views/controls/label.h" | 
|    52 #if defined(OS_WIN) |    52 #if defined(OS_WIN) | 
|    53 #include "views/drag_utils.h" |    53 #include "views/drag_utils.h" | 
| (...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1103   app_menu_contents_->AddItem(IDC_ABOUT, |  1103   app_menu_contents_->AddItem(IDC_ABOUT, | 
|  1104                               l10n_util::GetStringFUTF16( |  1104                               l10n_util::GetStringFUTF16( | 
|  1105                                   IDS_ABOUT, |  1105                                   IDS_ABOUT, | 
|  1106                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |  1106                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 
|  1107   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); |  1107   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); | 
|  1108   app_menu_contents_->AddSeparator(); |  1108   app_menu_contents_->AddSeparator(); | 
|  1109   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); |  1109   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); | 
|  1110  |  1110  | 
|  1111   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); |  1111   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); | 
|  1112 } |  1112 } | 
| OLD | NEW |