| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <windows.h> | 5 #include <windows.h> |
| 6 #include <shellapi.h> | 6 #include <shellapi.h> |
| 7 | 7 |
| 8 #include "chrome/browser/browser.h" | 8 #include "chrome/browser/browser.h" |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1150 case IDC_ENCODING_KOI8U: | 1150 case IDC_ENCODING_KOI8U: |
| 1151 case IDC_ENCODING_ISO88597: | 1151 case IDC_ENCODING_ISO88597: |
| 1152 case IDC_ENCODING_WINDOWS1253: | 1152 case IDC_ENCODING_WINDOWS1253: |
| 1153 case IDC_ENCODING_ISO88594: | 1153 case IDC_ENCODING_ISO88594: |
| 1154 case IDC_ENCODING_ISO885913: | 1154 case IDC_ENCODING_ISO885913: |
| 1155 case IDC_ENCODING_WINDOWS1257: | 1155 case IDC_ENCODING_WINDOWS1257: |
| 1156 case IDC_ENCODING_ISO88593: | 1156 case IDC_ENCODING_ISO88593: |
| 1157 case IDC_ENCODING_ISO885910: | 1157 case IDC_ENCODING_ISO885910: |
| 1158 case IDC_ENCODING_ISO885914: | 1158 case IDC_ENCODING_ISO885914: |
| 1159 case IDC_ENCODING_ISO885916: | 1159 case IDC_ENCODING_ISO885916: |
| 1160 case IDC_ENCODING_ISO88599: | |
| 1161 case IDC_ENCODING_WINDOWS1254: | 1160 case IDC_ENCODING_WINDOWS1254: |
| 1162 case IDC_ENCODING_ISO88596: | 1161 case IDC_ENCODING_ISO88596: |
| 1163 case IDC_ENCODING_WINDOWS1256: | 1162 case IDC_ENCODING_WINDOWS1256: |
| 1164 case IDC_ENCODING_ISO88598: | 1163 case IDC_ENCODING_ISO88598: |
| 1165 case IDC_ENCODING_WINDOWS1255: | 1164 case IDC_ENCODING_WINDOWS1255: |
| 1166 case IDC_ENCODING_WINDOWS1258: OverrideEncoding(id); break; | 1165 case IDC_ENCODING_WINDOWS1258: OverrideEncoding(id); break; |
| 1167 | 1166 |
| 1168 case IDC_EDIT_SEARCH_ENGINES: OpenKeywordEditor(); break; | 1167 case IDC_EDIT_SEARCH_ENGINES: OpenKeywordEditor(); break; |
| 1169 case IDC_CLEAR_BROWSING_DATA: OpenClearBrowsingDataDialog(); break; | 1168 case IDC_CLEAR_BROWSING_DATA: OpenClearBrowsingDataDialog(); break; |
| 1170 case IDC_IMPORT_SETTINGS: OpenImportSettingsDialog(); break; | 1169 case IDC_IMPORT_SETTINGS: OpenImportSettingsDialog(); break; |
| (...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1922 controller_.UpdateCommandEnabled(IDC_ENCODING_KOI8U, true); | 1921 controller_.UpdateCommandEnabled(IDC_ENCODING_KOI8U, true); |
| 1923 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88597, true); | 1922 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88597, true); |
| 1924 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1253, true); | 1923 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1253, true); |
| 1925 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88594, true); | 1924 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88594, true); |
| 1926 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885913, true); | 1925 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885913, true); |
| 1927 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1257, true); | 1926 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1257, true); |
| 1928 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88593, true); | 1927 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88593, true); |
| 1929 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885910, true); | 1928 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885910, true); |
| 1930 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885914, true); | 1929 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885914, true); |
| 1931 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885916, true); | 1930 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885916, true); |
| 1932 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88599, true); | |
| 1933 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1254, true); | 1931 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1254, true); |
| 1934 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88596, true); | 1932 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88596, true); |
| 1935 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1256, true); | 1933 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1256, true); |
| 1936 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88598, true); | 1934 controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88598, true); |
| 1937 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1255, true); | 1935 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1255, true); |
| 1938 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1258, true); | 1936 controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1258, true); |
| 1939 controller_.UpdateCommandEnabled(IDC_OPTIONS, true); | 1937 controller_.UpdateCommandEnabled(IDC_OPTIONS, true); |
| 1940 controller_.UpdateCommandEnabled(IDC_CLOSE_WEB_APP, type() != TYPE_NORMAL); | 1938 controller_.UpdateCommandEnabled(IDC_CLOSE_WEB_APP, type() != TYPE_NORMAL); |
| 1941 controller_.UpdateCommandEnabled(IDC_SHOW_AS_TAB, type() == TYPE_POPUP); | 1939 controller_.UpdateCommandEnabled(IDC_SHOW_AS_TAB, type() == TYPE_POPUP); |
| 1942 controller_.UpdateCommandEnabled( | 1940 controller_.UpdateCommandEnabled( |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2345 | 2343 |
| 2346 // We need to register the window position pref. | 2344 // We need to register the window position pref. |
| 2347 std::wstring window_pref(prefs::kBrowserWindowPlacement); | 2345 std::wstring window_pref(prefs::kBrowserWindowPlacement); |
| 2348 window_pref.append(L"_"); | 2346 window_pref.append(L"_"); |
| 2349 window_pref.append(app_name); | 2347 window_pref.append(app_name); |
| 2350 PrefService* prefs = g_browser_process->local_state(); | 2348 PrefService* prefs = g_browser_process->local_state(); |
| 2351 DCHECK(prefs); | 2349 DCHECK(prefs); |
| 2352 | 2350 |
| 2353 prefs->RegisterDictionaryPref(window_pref.c_str()); | 2351 prefs->RegisterDictionaryPref(window_pref.c_str()); |
| 2354 } | 2352 } |
| OLD | NEW |