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

Side by Side Diff: chrome/browser/dom_ui/bug_report_ui.cc

Issue 6046009: Move base/mac_util.h to base/mac and use the base::mac namespace.... (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
« no previous file with comments | « chrome/browser/bug_report_util.h ('k') | chrome/browser/history/history_database.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/dom_ui/bug_report_ui.h" 5 #include "chrome/browser/dom_ui/bug_report_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 21 matching lines...) Expand all
32 #include "gfx/rect.h" 32 #include "gfx/rect.h"
33 33
34 #include "grit/browser_resources.h" 34 #include "grit/browser_resources.h"
35 #include "grit/chromium_strings.h" 35 #include "grit/chromium_strings.h"
36 #include "grit/generated_resources.h" 36 #include "grit/generated_resources.h"
37 #include "grit/locale_settings.h" 37 #include "grit/locale_settings.h"
38 38
39 #if defined(USE_X11) 39 #if defined(USE_X11)
40 #include "app/x11_util.h" 40 #include "app/x11_util.h"
41 #elif defined(OS_MACOSX) 41 #elif defined(OS_MACOSX)
42 #include "base/mac_util.h" 42 #include "base/mac/mac_util.h"
43 #elif defined(OS_WIN) 43 #elif defined(OS_WIN)
44 #include "app/win/win_util.h" 44 #include "app/win/win_util.h"
45 #endif 45 #endif
46 46
47 #if defined(TOOLKIT_VIEWS) 47 #if defined(TOOLKIT_VIEWS)
48 #include "views/window/window.h" 48 #include "views/window/window.h"
49 #endif 49 #endif
50 50
51 #if defined(OS_CHROMEOS) 51 #if defined(OS_CHROMEOS)
52 #include "base/file_util.h" 52 #include "base/file_util.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 // Grab an exact snapshot of the window that the user is seeing (i.e. as 166 // Grab an exact snapshot of the window that the user is seeing (i.e. as
167 // rendered--do not re-render, and include windowed plugins). 167 // rendered--do not re-render, and include windowed plugins).
168 if (last_screenshot_png) 168 if (last_screenshot_png)
169 last_screenshot_png->clear(); 169 last_screenshot_png->clear();
170 else 170 else
171 last_screenshot_png = new std::vector<unsigned char>; 171 last_screenshot_png = new std::vector<unsigned char>;
172 172
173 #if defined(USE_X11) 173 #if defined(USE_X11)
174 x11_util::GrabWindowSnapshot(window, last_screenshot_png); 174 x11_util::GrabWindowSnapshot(window, last_screenshot_png);
175 #elif defined(OS_MACOSX) 175 #elif defined(OS_MACOSX)
176 mac_util::GrabWindowSnapshot(window, last_screenshot_png, &width, &height); 176 base::mac::GrabWindowSnapshot(window, last_screenshot_png, &width, &height);
177 #elif defined(OS_WIN) 177 #elif defined(OS_WIN)
178 app::win::GrabWindowSnapshot(window, last_screenshot_png); 178 app::win::GrabWindowSnapshot(window, last_screenshot_png);
179 #endif 179 #endif
180 180
181 screen_size.set_width(width); 181 screen_size.set_width(width);
182 screen_size.set_height(height); 182 screen_size.set_height(height);
183 } 183 }
184 184
185 #if defined(TOOLKIT_VIEWS) 185 #if defined(TOOLKIT_VIEWS)
186 void ShowHtmlBugReportView(views::Window* parent, Browser* browser) { 186 void ShowHtmlBugReportView(views::Window* parent, Browser* browser) {
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 BugReportUIHTMLSource* html_source = 809 BugReportUIHTMLSource* html_source =
810 new BugReportUIHTMLSource(handler->Init()); 810 new BugReportUIHTMLSource(handler->Init());
811 // Set up the chrome://bugreport/ source. 811 // Set up the chrome://bugreport/ source.
812 BrowserThread::PostTask( 812 BrowserThread::PostTask(
813 BrowserThread::IO, FROM_HERE, 813 BrowserThread::IO, FROM_HERE,
814 NewRunnableMethod( 814 NewRunnableMethod(
815 ChromeURLDataManager::GetInstance(), 815 ChromeURLDataManager::GetInstance(),
816 &ChromeURLDataManager::AddDataSource, 816 &ChromeURLDataManager::AddDataSource,
817 make_scoped_refptr(html_source))); 817 make_scoped_refptr(html_source)));
818 } 818 }
OLDNEW
« no previous file with comments | « chrome/browser/bug_report_util.h ('k') | chrome/browser/history/history_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698