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

Side by Side Diff: chrome/browser/ui/views/content_setting_bubble_contents.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflict resolved Created 9 years, 3 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/views/content_setting_bubble_contents.h" 5 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gdk/gdk.h> 8 #include <gdk/gdk.h>
9 #endif 9 #endif
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 HitTest(event.location())) { 81 HitTest(event.location())) {
82 parent_->LinkClicked(link_, event.flags()); 82 parent_->LinkClicked(link_, event.flags());
83 } 83 }
84 } 84 }
85 85
86 gfx::NativeCursor ContentSettingBubbleContents::Favicon::GetCursor( 86 gfx::NativeCursor ContentSettingBubbleContents::Favicon::GetCursor(
87 const views::MouseEvent& event) { 87 const views::MouseEvent& event) {
88 #if defined(OS_WIN) 88 #if defined(OS_WIN)
89 static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_HAND); 89 static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_HAND);
90 return g_hand_cursor; 90 return g_hand_cursor;
91 #elif defined(USE_AURA)
92 // TODO(saintlou):
93 return NULL;
91 #elif defined(TOOLKIT_USES_GTK) 94 #elif defined(TOOLKIT_USES_GTK)
92 return gfx::GetCursor(GDK_HAND2); 95 return gfx::GetCursor(GDK_HAND2);
93 #endif 96 #endif
94 } 97 }
95 98
96 ContentSettingBubbleContents::ContentSettingBubbleContents( 99 ContentSettingBubbleContents::ContentSettingBubbleContents(
97 ContentSettingBubbleModel* content_setting_bubble_model, 100 ContentSettingBubbleModel* content_setting_bubble_model,
98 Profile* profile, 101 Profile* profile,
99 TabContents* tab_contents) 102 TabContents* tab_contents)
100 : content_setting_bubble_model_(content_setting_bubble_model), 103 : content_setting_bubble_model_(content_setting_bubble_model),
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 layout->StartRow(0, double_column_set_id); 325 layout->StartRow(0, double_column_set_id);
323 manage_link_ = new views::Link(UTF8ToWide(bubble_content.manage_link)); 326 manage_link_ = new views::Link(UTF8ToWide(bubble_content.manage_link));
324 manage_link_->set_listener(this); 327 manage_link_->set_listener(this);
325 layout->AddView(manage_link_); 328 layout->AddView(manage_link_);
326 329
327 close_button_ = 330 close_button_ =
328 new views::NativeTextButton(this, 331 new views::NativeTextButton(this,
329 UTF16ToWide(l10n_util::GetStringUTF16(IDS_DONE))); 332 UTF16ToWide(l10n_util::GetStringUTF16(IDS_DONE)));
330 layout->AddView(close_button_); 333 layout->AddView(close_button_);
331 } 334 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698